From dc56c095787262b5a099ac69cc73be2f20396ad0 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Mon, 7 Nov 2022 13:17:01 -0500
Subject: [PATCH] Upgrade to Servlet 6.0, Tomcat 10.1.1

* Upgrade to Micrometer `1.10.0` GA; Jackson `2.14.0`, Spring Kafka `3.0.0-RC2`
---
 build.gradle       | 12 ++++++------
 gradle/docs.gradle |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index eb4c94429e..3b8e9b3fbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ ext {
     hibernateVersion = '6.1.4.Final'
     hsqldbVersion = '2.7.0'
     h2Version = '2.1.214'
-    jacksonVersion = '2.14.0-rc2'
+    jacksonVersion = '2.14.0'
     jaxbVersion = '3.0.2'
     jcifsVersion = '2.1.32'
     jeroMqVersion = '0.5.2'
@@ -89,8 +89,8 @@ ext {
     lettuceVersion = '6.2.1.RELEASE'
     log4jVersion = '2.19.0'
     mailVersion = '2.0.1'
-    micrometerVersion = '1.10.0-SNAPSHOT'
-    micrometerTracingVersion = '1.0.0-SNAPSHOT'
+    micrometerVersion = '1.10.0'
+    micrometerTracingVersion = '1.0.0'
     mockitoVersion = '4.8.0'
     mongoDriverVersion = '4.7.2'
     mysqlVersion = '8.0.30'
@@ -101,18 +101,18 @@ ext {
     resilience4jVersion = '1.7.1'
     romeToolsVersion = '1.18.0'
     rsocketVersion = '1.1.3'
-    servletApiVersion = '5.0.0'
+    servletApiVersion = '6.0.0'
     smackVersion = '4.4.6'
     springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
     springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
     springGraphqlVersion = '1.1.0-SNAPSHOT'
-    springKafkaVersion = '3.0.0-SNAPSHOT'
+    springKafkaVersion = '3.0.0-RC2'
     springRetryVersion = '2.0.0-SNAPSHOT'
     springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
     springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
     springWsVersion = '4.0.0-SNAPSHOT'
     testcontainersVersion = '1.17.5'
-    tomcatVersion = '10.0.23'
+    tomcatVersion = '10.1.1'
     xmlUnitVersion = '2.9.0'
     xstreamVersion = '1.4.19'
 
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 46acd87715..814dfd78ee 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -1,6 +1,6 @@
 ext {
 	backendVersion = '0.0.3'
-	micrometerDocsVersion='1.0.0-SNAPSHOT'
+	micrometerDocsVersion='1.0.0'
 }
 
 configurations {