From e376b137c73419f3721329db2659050fd76f307e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@icinga.com>
Date: Mon, 27 Nov 2017 16:18:13 +0100
Subject: [PATCH] Prepare release version 2.5.0

---
 .mailmap                               |  5 ++++-
 AUTHORS                                | 11 ++++++++++-
 VERSION                                |  2 +-
 library/Icinga/Application/Version.php |  2 +-
 modules/doc/module.info                |  2 +-
 modules/monitoring/module.info         |  2 +-
 modules/setup/module.info              |  2 +-
 modules/test/module.info               |  2 +-
 modules/translation/module.info        |  2 +-
 9 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.mailmap b/.mailmap
index d507506bf..e69d575ed 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,6 @@
 Alexander A. Klimov <alexander.klimov@icinga.com> <Alexander.Klimov@netways.de>
 Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@netways.de>
+Alexander A. Klimov <alexander.klimov@icinga.com> <Al2Klimov@users.noreply.github.com>
 Bernd Erk <bernd.erk@icinga.com> <bernd.erk@netways.de>
 Bernd Erk <bernd.erk@icinga.com><berk@nb-berk.int.netways.de>
 Bernd Erk <bernd.erk@icinga.com><berk@nb-berk.local>
@@ -13,8 +14,9 @@ Eric Lippmann <eric.lippmann@icinga.com> <lippserd@googlemail.com>
 Florian Strohmaier <florian.strohmaier@icinga.com> <florian.strohmaier@netways.de>
 Florian Strohmaier <florian.strohmaier@icinga.com> <hello@florianstrohmaier.com>
 Gunnar Beutner <gunnar.beutner@netways.de> <gunnar@beutner.name>
-Johannes Meyer <johannes.meyer@icinga.com> <johannes.meyer@netways.de>
 Jannis Moßhammer <jannis.mosshammer@netways.de>
+Johannes Meyer <johannes.meyer@icinga.com> <johannes.meyer@netways.de>
+Jennifer Mourek <jennifer.mourek@icinga.com> <jennifer.mourek@netways.de>
 Markus Frosch <markus.frosch@icinga.com> <lazyfrosch@icinga.org>
 Markus Frosch <markus.frosch@icinga.com> <markus.frosch@netways.de>
 Markus Frosch <markus.frosch@icinga.com> <markus@lazyfrosch.de>
@@ -22,6 +24,7 @@ Matthias Jentsch <matthias.jentsch@netways.de> <mjentsch@localhost.int.netways.d
 Michael Friedrich <michael.friedrich@icinga.com> <Michael.Friedrich@netways.de>
 Michael Friedrich <michael.friedrich@icinga.com> <michael.friedrich@gmail.com>
 Michael Friedrich <michael.friedrich@icinga.com> <michael.friedrich@netways.de>
+Nicolai Buchwitz <nicolai.buchwitz@enda.eu> <nbuchwitz@users.noreply.github.com>
 Noah Hilverling <noah.hilverling@icinga.com> <noah.hilverling@netways.de>
 Sylph Lin <sylph.lin@gmail.com>
 Thomas Gelf <thomas.gelf@icinga.com> <root@squeeze-devel1.osmc.lab>
diff --git a/AUTHORS b/AUTHORS
index ff84713fb..bbaa6536c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,11 +28,13 @@ Hector Sanjuan <hector.sanjuan@nugg.ad>
 Heike Jurzik <huhn@lion-3.fritz.box>
 Ian Shearin <ishearin@womply.com>
 Jannis Moßhammer <jannis.mosshammer@netways.de>
-Jennifer Mourek <jennifer.mourek@netways.de>
+Jennifer Mourek <jennifer.mourek@icinga.com>
 Jo Rhett <jo@chegg.com>
 Joe Doherty <git@pjuu.com>
 Johannes Meyer <johannes.meyer@icinga.com>
+Joonas Kylmälä <joonas.kylmala@kirjastot.fi>
 Ken Jungclaus <lum33n@web.de>
+Klaus Jrgensen <klaus@blackwoodseven.com>
 Lee Clemens <java@leeclemens.net>
 Louis Sautier <sautier.louis@gmail.com>
 Marc DeTrano <marc@gridshield.net>
@@ -41,8 +43,10 @@ Marius Hein <marius.hein@netways.de>
 Markus Frosch <markus.frosch@icinga.com>
 Matthias Jentsch <matthias.jentsch@netways.de>
 Michael Friedrich <michael.friedrich@icinga.com>
+Mikesch-mp <Mikesch-mp@koebbes.de>
 Mikko Peltokangas <mikko@peltokangas.org>
 Munzir Taha <munzirtaha@gmail.com>
+Nicolai Buchwitz <nicolai.buchwitz@enda.eu>
 Noah Hilverling <noah.hilverling@icinga.com>
 Paul Richards <paul@minimoo.org>
 Pavlos Daoglou <pdaoglou@gmail.com>
@@ -54,12 +58,14 @@ Roland Hopferwieser <rhopfer@ica.jku.at>
 Rune Darrud <theflyingcorpse@gmail.com>
 Russell Kubik <russkubik@3d-p.com>
 Sander Ferdinand <sa.ferdinand@gmail.com>
+Simone Orsi <simahawk@users.noreply.github.com>
 Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
 Sylph Lin <sylph.lin@gmail.com>
 Thomas Gelf <thomas.gelf@icinga.com>
 Tim Helfensdörfer <tim@visualappeal.de>
 Tobias von der Krone <tobias.vonderkrone@profitbricks.com>
 Tom Ford <exptom@users.noreply.github.com>
+Tomas Barton <barton.tomas@gmail.com>
 Ulf Lange <mopp@gmx.net>
 Uwe Ebel <kobmaki@aol.com>
 Vladislav Ponomarev <vponomarev@team.mobile.de>
@@ -67,9 +73,12 @@ Yuri Konotopov <ykonotopov@gmail.com>
 ayoubabid <ayoubabid@users.noreply.github.com>
 baufrecht <baufrecht@users.noreply.github.com>
 bradynathan <bradynathan@gmail.com>
+cstegm <cstegm@users.noreply.github.com>
 hailthemelody@rm-laptop04 <hailthemelody@rm-laptop04>
 mbaschnitzi <mbaschnitzi@users.noreply.github.com>
 rbelinsky <rbelinsky@dalet.com>
 realitygaps <github@gapsinreality.com>
 rkcpi <thieme.sandra@gmail.com>
+ss23 <stephen@zxsecurity.co.nz>
+tfylling <torbfylling@gmail.com>
 xert <xert@users.noreply.github.com>
diff --git a/VERSION b/VERSION
index 3dfbe3369..21222ceed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.4.2
+v2.5.0
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index 4c748fee2..fd62f81f2 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@ namespace Icinga\Application;
  */
 class Version
 {
-    const VERSION = '2.4.2';
+    const VERSION = '2.5.0';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index d5a6f49ce..9779dfd8b 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.4.2
+Version: 2.5.0
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info
index 604de3663..d0036a536 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.4.2
+Version: 2.5.0
 Description: Icinga monitoring module
  This is the core module for most Icingaweb users. It provides an
  abstraction layer for various Icinga data backends.
diff --git a/modules/setup/module.info b/modules/setup/module.info
index 5cd905ebe..9dfa4fe29 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.4.2
+Version: 2.5.0
 Description: Setup module
  Web based wizard for setting up Icinga Web 2 and its modules.
  This includes the data backends (e.g. relational database, LDAP),
diff --git a/modules/test/module.info b/modules/test/module.info
index 79f51f550..53ba03019 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.4.2
+Version: 2.5.0
 Description: Translation module
  This module allows developers to run (unit) tests against Icinga Web 2 and
  any of its modules. Usually you do not need to enable this.
diff --git a/modules/translation/module.info b/modules/translation/module.info
index 18366160f..58bac54df 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.4.2
+Version: 2.5.0
 Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
  its modules for multiple languages. You do not need this module to run an