.......... [ZBXNEXT-826] updated release date and version [6.0.7]6.0.7

6 files changed, 24 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 25de5ca7b62..423748b94f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 6.0.7
+
+6.0.7rc1 was released as 6.0.7 without any changes
+
+--------------------------------------------------------------------------------
 Changes for 6.0.7rc1
 
 New features:
@@ -54,6 +59,7 @@ A.F....... [ZBX-7706] improved performance of graph.get and graphprototype.get m
 .........T [ZBX-20473] fixed evaluation period macro in disk space triggers for NetApp FAS3220 template (drasihov)
 .........T [ZBX-19205] fixed item preprocessing in PostgreSQL by Zabbix agent 2 template (drasihov)
 A.F.....S. [ZBX-20743] fixed error handling in compression with Apache licensed TimescaleDB 2.x (agriscenko, mprihodko)
+..F....... [ZBX-21350] fixed cross-site scripting vulnerability in backurl parameter (agriscenko)
 
 --------------------------------------------------------------------------------
 Changes for 6.0.6
@@ -2018,6 +2024,11 @@ A......... [ZBX-17955] fixed "medias" parameter named inconsistency in user.crea
 .......PS. [ZBX-17548] don't store text items with history 0 in proxy history (wiper)
 
 --------------------------------------------------------------------------------
+Changes for 5.0.26
+
+5.0.26rc1 was released as 5.0.26 without any changes
+
+--------------------------------------------------------------------------------
 Changes for 5.0.26rc1
 
 New features:
@@ -4565,6 +4576,11 @@ A.F.I...S. [ZBXNEXT-4853,ZBXNEXT-517] added ability to send email messages in HT
 ..F.....S. [ZBXNEXT-1282,ZBXNEXT-4730] added changes to introduce regex based matching for auto-registration (vasilijs, viktors)
 
 --------------------------------------------------------------------------------
+Changes for 4.0.43
+
+4.0.43rc1 was released as 4.0.43 without any changes
+
+--------------------------------------------------------------------------------
 Changes for 4.0.43rc1
 
 Bug fixes:
diff --git a/configure.ac b/configure.ac
index 5752b1a27cb..6a6aba57ba8 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],[6.0.7rc1])
+AC_INIT([Zabbix],[6.0.7])
 AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
 AM_INIT_AUTOMAKE([subdir-objects tar-pax])
 
diff --git a/include/version.h b/include/version.h
index d4db28d9dfa..8485752a290 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		"19 July 2022"
+#define ZABBIX_REVDATE		"25 July 2022"
 #define ZABBIX_VERSION_MAJOR	6
 #define ZABBIX_VERSION_MINOR	0
 #define ZABBIX_VERSION_PATCH	7
@@ -36,7 +36,7 @@
 #		define ZABBIX_VERSION_RC_NUM	{ZABBIX_RC_NUM}
 #	endif
 #endif
-#define ZABBIX_VERSION_RC	"rc1"
+#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 fb3ac58b15e..20ba2dff8d7 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -26,11 +26,11 @@ import (
 )
 
 const (
-	ZABBIX_REVDATE          = "19 July 2022"
+	ZABBIX_REVDATE          = "25 July 2022"
 	ZABBIX_VERSION_MAJOR    = 6
 	ZABBIX_VERSION_MINOR    = 0
 	ZABBIX_VERSION_PATCH    = 7
-	ZABBIX_VERSION_RC       = "rc1"
+	ZABBIX_VERSION_RC       = ""
 	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 6c5b88e9ce6..6fd6483e9f0 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 = "19 July 2022";
+	static final String REVISION_DATE = "25 July 2022";
 	static final String REVISION = "{ZABBIX_REVISION}";
-	static final String VERSION = "6.0.7rc1";
+	static final String VERSION = "6.0.7";
 
 	static void printVersion()
 	{
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index f8c58aecb61..f5c13394de1 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',		'6.0.7rc1');
+define('ZABBIX_VERSION',		'6.0.7');
 define('ZABBIX_API_VERSION',	'6.0.7');
 define('ZABBIX_EXPORT_VERSION',	'6.0');