diff options
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/version.h | 6 | ||||
-rw-r--r-- | src/go/pkg/version/version.go | 6 | ||||
-rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 2 | ||||
-rw-r--r-- | ui/include/defines.inc.php | 4 | ||||
-rw-r--r-- | ui/tests/api_json/testAPIInfo.php | 2 |
7 files changed, 25 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 9eba5711ffa..475d6e59ea7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Changes for 6.0.0alpha1 + +New features: + +Bug fixes: + +-------------------------------------------------------------------------------- +Changes for 5.4.1rc1 + +New features: + +Bug fixes: + +-------------------------------------------------------------------------------- Changes for 5.4.0 5.4.0rc2 was released as 5.4.0 without any changes diff --git a/configure.ac b/configure.ac index 8e0a3a5c7f0..f3effa52e49 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([Zabbix],[5.4.0]) +AC_INIT([Zabbix],[6.0.0alpha1]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99]) diff --git a/include/version.h b/include/version.h index e147f8cab23..9f0938cef8e 100644 --- a/include/version.h +++ b/include/version.h @@ -25,8 +25,8 @@ #define APPLICATION_NAME "Zabbix Agent" #define ZABBIX_REVDATE "14 May 2021" -#define ZABBIX_VERSION_MAJOR 5 -#define ZABBIX_VERSION_MINOR 4 +#define ZABBIX_VERSION_MAJOR 6 +#define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 0 #ifndef ZABBIX_VERSION_REVISION # define ZABBIX_VERSION_REVISION {ZABBIX_REVISION} @@ -36,7 +36,7 @@ # define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM} # endif #endif -#define ZABBIX_VERSION_RC "" +#define ZABBIX_VERSION_RC "alpha1" #define ZABBIX_VERSION ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \ ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC #define ZABBIX_REVISION ZBX_STR(ZABBIX_VERSION_REVISION) diff --git a/src/go/pkg/version/version.go b/src/go/pkg/version/version.go index bd69144e9dd..f5f944f419a 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -27,10 +27,10 @@ import ( const ( ZABBIX_REVDATE = "14 May 2021" - ZABBIX_VERSION_MAJOR = 5 - ZABBIX_VERSION_MINOR = 4 + ZABBIX_VERSION_MAJOR = 6 + ZABBIX_VERSION_MINOR = 0 ZABBIX_VERSION_PATCH = 0 - ZABBIX_VERSION_RC = "" + ZABBIX_VERSION_RC = "alpha1" ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}" ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}" copyrightMessage = "Copyright (C) 2021 Zabbix SIA\n" + diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java index 384e0d6ca54..3e4a666d04b 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java +++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java @@ -24,7 +24,7 @@ class GeneralInformation static final String APPLICATION_NAME = "Zabbix Java Gateway"; static final String REVISION_DATE = "14 May 2021"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "5.4.0"; + static final String VERSION = "6.0.0alpha1"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index bb3d61f45d1..98ddc5c7daf 100644 --- a/ui/include/defines.inc.php +++ b/ui/include/defines.inc.php @@ -18,8 +18,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -define('ZABBIX_VERSION', '5.4.0'); -define('ZABBIX_API_VERSION', '5.4.0'); +define('ZABBIX_VERSION', '6.0.0alpha1'); +define('ZABBIX_API_VERSION', '6.0.0'); define('ZABBIX_EXPORT_VERSION', '5.4'); define('ZABBIX_DB_VERSION', 5040000); diff --git a/ui/tests/api_json/testAPIInfo.php b/ui/tests/api_json/testAPIInfo.php index d9ca1b6f2f3..e0d231217ee 100644 --- a/ui/tests/api_json/testAPIInfo.php +++ b/ui/tests/api_json/testAPIInfo.php @@ -36,6 +36,6 @@ class testAPIInfo extends CAPITest { $this->disableAuthorization(); $result = $this->call('apiinfo.version', []); - $this->assertSame('5.4.0', $result['result']); + $this->assertSame('6.0.0', $result['result']); } } |