Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergejs Maklakovs <sergejs.maklakovs@zabbix.com>2022-11-03 10:28:37 +0300
committerSergejs Maklakovs <sergejs.maklakovs@zabbix.com>2022-11-03 10:28:37 +0300
commit6829766dc28e9f1994a4eaea5b5482b725ca2caf (patch)
treecdb9d2f774b27355c643c4addd01297d43ec78e6
parente7cffb989f2d7100e5012d07bc027de6556c3130 (diff)
.......... [ZBXNEXT-826] updated release version [5.0.30rc1]; updated API version [5.0.30]
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--include/version.h4
-rw-r--r--src/go/pkg/version/version.go4
-rw-r--r--src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java2
-rw-r--r--ui/include/defines.inc.php4
-rw-r--r--ui/tests/api_json/testAPIInfo.php2
7 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b8df1ae0fa4..ae39ee5093e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes for 5.0.30rc1
+
+New features:
+
+Bug fixes:
+
+--------------------------------------------------------------------------------
Changes for 5.0.29
5.0.29rc2 was released as 5.0.29 without any changes
diff --git a/configure.ac b/configure.ac
index f30eee9ef88..1b733e58b06 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.0.29])
+AC_INIT([Zabbix],[5.0.30rc1])
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 af9a6e48d81..02326627754 100644
--- a/include/version.h
+++ b/include/version.h
@@ -27,7 +27,7 @@
#define ZABBIX_REVDATE "2 November 2022"
#define ZABBIX_VERSION_MAJOR 5
#define ZABBIX_VERSION_MINOR 0
-#define ZABBIX_VERSION_PATCH 29
+#define ZABBIX_VERSION_PATCH 30
#ifndef ZABBIX_VERSION_REVISION
# define ZABBIX_VERSION_REVISION {ZABBIX_REVISION}
#endif
@@ -36,7 +36,7 @@
# define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM}
# endif
#endif
-#define ZABBIX_VERSION_RC ""
+#define ZABBIX_VERSION_RC "rc1"
#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 3a7e1e20c61..4516ed24e3d 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -32,8 +32,8 @@ const (
ZABBIX_REVDATE = "2 November 2022"
ZABBIX_VERSION_MAJOR = 5
ZABBIX_VERSION_MINOR = 0
- ZABBIX_VERSION_PATCH = 29
- ZABBIX_VERSION_RC = ""
+ ZABBIX_VERSION_PATCH = 30
+ ZABBIX_VERSION_RC = "rc1"
ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}"
ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}"
copyrightMessage = "Copyright (C) 2022 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 a3523445f30..e11d4c74193 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 = "2 November 2022";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "5.0.29";
+ static final String VERSION = "5.0.30rc1";
static void printVersion()
{
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index 6c2068f479f..2b58adbe113 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.0.29');
-define('ZABBIX_API_VERSION', '5.0.29');
+define('ZABBIX_VERSION', '5.0.30rc1');
+define('ZABBIX_API_VERSION', '5.0.30');
define('ZABBIX_EXPORT_VERSION', '5.0');
define('ZABBIX_DB_VERSION', 5000000);
diff --git a/ui/tests/api_json/testAPIInfo.php b/ui/tests/api_json/testAPIInfo.php
index 3ace0218a45..d1b33fd7274 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.0.29', $result['result']);
+ $this->assertSame('5.0.30', $result['result']);
}
}