diff options
| author | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2021-05-14 11:29:01 +0300 |
|---|---|---|
| committer | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2021-05-14 11:29:01 +0300 |
| commit | 5059e20a75d6d26ee95f352a9d8458bf27db9d16 (patch) | |
| tree | 15e45553787cab810e1c11785d1cf325fc93d5dc | |
| parent | 6c18203d8e2ce134ebfd318a9b4778cc5d2ab746 (diff) | |
.......... [ZBXNEXT-826] updated release date and version [5.4.0]5.4.0
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/version.h | 4 | ||||
| -rw-r--r-- | src/go/pkg/version/version.go | 4 | ||||
| -rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 4 | ||||
| -rw-r--r-- | ui/include/defines.inc.php | 2 |
6 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 2906d624e15..8d6828c1b34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 5.4.0 + +5.4.0rc2 was released as 5.4.0 without any changes + +-------------------------------------------------------------------------------- Changes for 5.4.0rc2 Bug fixes: diff --git a/configure.ac b/configure.ac index a60d6c7efaa..8e0a3a5c7f0 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.0rc2]) +AC_INIT([Zabbix],[5.4.0]) 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 453a4d75167..e147f8cab23 100644 --- a/include/version.h +++ b/include/version.h @@ -24,7 +24,7 @@ #define ZBX_STR(str) ZBX_STR2(str) #define APPLICATION_NAME "Zabbix Agent" -#define ZABBIX_REVDATE "13 May 2021" +#define ZABBIX_REVDATE "14 May 2021" #define ZABBIX_VERSION_MAJOR 5 #define ZABBIX_VERSION_MINOR 4 #define ZABBIX_VERSION_PATCH 0 @@ -36,7 +36,7 @@ # define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM} # endif #endif -#define ZABBIX_VERSION_RC "rc2" +#define ZABBIX_VERSION_RC "" #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 fb2821a82ab..bd69144e9dd 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -26,11 +26,11 @@ import ( ) const ( - ZABBIX_REVDATE = "13 May 2021" + ZABBIX_REVDATE = "14 May 2021" ZABBIX_VERSION_MAJOR = 5 ZABBIX_VERSION_MINOR = 4 ZABBIX_VERSION_PATCH = 0 - ZABBIX_VERSION_RC = "rc2" + ZABBIX_VERSION_RC = "" 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 a82c6e69e0c..384e0d6ca54 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java +++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java @@ -22,9 +22,9 @@ package com.zabbix.gateway; class GeneralInformation { static final String APPLICATION_NAME = "Zabbix Java Gateway"; - static final String REVISION_DATE = "13 May 2021"; + static final String REVISION_DATE = "14 May 2021"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "5.4.0rc2"; + static final String VERSION = "5.4.0"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index eca6b236b51..bb3d61f45d1 100644 --- a/ui/include/defines.inc.php +++ b/ui/include/defines.inc.php @@ -18,7 +18,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -define('ZABBIX_VERSION', '5.4.0rc2'); +define('ZABBIX_VERSION', '5.4.0'); define('ZABBIX_API_VERSION', '5.4.0'); define('ZABBIX_EXPORT_VERSION', '5.4'); |