From 7576117dd970eeec857812570723ee58580f4e5e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:20:04 +0200 Subject: [PATCH 01/16] Upgrade to Micrometer 1.9.12 Closes gh-35725 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 1bf74c06592..39e8e2295c5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1327,7 +1327,7 @@ bom { ] } } - library("Micrometer", "1.9.12-SNAPSHOT") { + library("Micrometer", "1.9.12") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From f2a44d7f065b84d203e9ff9c479f7bb6491de4aa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:20:05 +0200 Subject: [PATCH 02/16] Upgrade to Reactor Bom 2020.0.33 Closes gh-35726 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 39e8e2295c5..4c7e593a403 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1486,7 +1486,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.33-SNAPSHOT") { + library("Reactor Bom", "2020.0.33") { group("io.projectreactor") { imports = [ "reactor-bom" From 2dbfe54762beadf45fbd797306b3aec354748018 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:23:33 +0200 Subject: [PATCH 03/16] Upgrade to Couchbase Client 3.4.7 Closes gh-35879 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 3b841115c20..a2cddb55dc7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -173,7 +173,7 @@ bom { ] } } - library("Couchbase Client", "3.4.6") { + library("Couchbase Client", "3.4.7") { group("com.couchbase.client") { modules = [ "java-client" From 10b66975dd6062923755b8140d1283428c62ee0f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:23:38 +0200 Subject: [PATCH 04/16] Upgrade to Glassfish JAXB 4.0.3 Closes gh-35880 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a2cddb55dc7..cbc50299c20 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -270,7 +270,7 @@ bom { ] } } - library("Glassfish JAXB", "4.0.2") { + library("Glassfish JAXB", "4.0.3") { group("org.glassfish.jaxb") { imports = [ "jaxb-bom" From 7cf41e9e0a9e9f5b4fa43174caecb58df02a6775 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:23:43 +0200 Subject: [PATCH 05/16] Upgrade to Logback 1.4.8 Closes gh-35881 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index cbc50299c20..ce6ea446a81 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -797,7 +797,7 @@ bom { ] } } - library("Logback", "1.4.7") { + library("Logback", "1.4.8") { group("ch.qos.logback") { modules = [ "logback-access", From 2d43f345de04f35617aa00077c84e4de8433511d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:23:43 +0200 Subject: [PATCH 06/16] Upgrade to Micrometer 1.10.8 Closes gh-35734 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index ce6ea446a81..1422a004a00 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -946,7 +946,7 @@ bom { ] } } - library("Micrometer", "1.10.8-SNAPSHOT") { + library("Micrometer", "1.10.8") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From 19009100085a7fe0f52ea19de9887445b650ab77 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:23:44 +0200 Subject: [PATCH 07/16] Upgrade to Micrometer Tracing 1.0.7 Closes gh-35735 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 1422a004a00..29545d17ece 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -958,7 +958,7 @@ bom { ] } } - library("Micrometer Tracing", "1.0.7-SNAPSHOT") { + library("Micrometer Tracing", "1.0.7") { group("io.micrometer") { imports = [ "micrometer-tracing-bom" From d3ff04fa4bf40c9f6d717f06a105de03bcbe8b6e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:23:44 +0200 Subject: [PATCH 08/16] Upgrade to Reactor Bom 2022.0.8 Closes gh-35736 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 29545d17ece..44d15e24460 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1155,7 +1155,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.8-SNAPSHOT") { + library("Reactor Bom", "2022.0.8") { group("io.projectreactor") { imports = [ "reactor-bom" From 0a558c590fd3b73167012aa49a11f056e72fa4f2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:23:50 +0200 Subject: [PATCH 09/16] Upgrade to Tomcat 10.1.10 Closes gh-35882 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ba723e094b3..ee941eb6300 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 nativeBuildToolsVersion=0.9.22 springFrameworkVersion=6.0.10-SNAPSHOT -tomcatVersion=10.1.9 +tomcatVersion=10.1.10 kotlin.stdlib.default.dependency=false From 1093d172a4a825cf0d5f2ce7d537b126b5ecba6e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:35:25 +0200 Subject: [PATCH 10/16] Upgrade to Couchbase Client 3.4.7 Closes gh-35883 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5a192db0ee5..03e93cc2e78 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -209,7 +209,7 @@ bom { ] } } - library("Couchbase Client", "3.4.6") { + library("Couchbase Client", "3.4.7") { group("com.couchbase.client") { modules = [ "java-client" From 9e642c984392e12c286e04b472962651c8189601 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:35:32 +0200 Subject: [PATCH 11/16] Upgrade to Hazelcast 5.2.4 Closes gh-35884 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 03e93cc2e78..13972e55953 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -357,7 +357,7 @@ bom { ] } } - library("Hazelcast", "5.2.3") { + library("Hazelcast", "5.2.4") { group("com.hazelcast") { modules = [ "hazelcast", From 4f3761c852d337423b23909eeb09b668940a21bf Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:35:37 +0200 Subject: [PATCH 12/16] Upgrade to Logback 1.4.8 Closes gh-35885 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 13972e55953..a91ba04f248 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -823,7 +823,7 @@ bom { ] } } - library("Logback", "1.4.7") { + library("Logback", "1.4.8") { group("ch.qos.logback") { modules = [ "logback-access", From b17c948d6126c5af8709812c34d7739032bf942f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:35:38 +0200 Subject: [PATCH 13/16] Upgrade to Micrometer 1.11.1 Closes gh-35745 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a91ba04f248..201d28e6122 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -972,7 +972,7 @@ bom { ] } } - library("Micrometer", "1.11.1-SNAPSHOT") { + library("Micrometer", "1.11.1") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From 61bae46deba4f5eb33b314b439a967571a5310c0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:35:38 +0200 Subject: [PATCH 14/16] Upgrade to Micrometer Tracing 1.1.2 Closes gh-35746 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 201d28e6122..cabf6336d30 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -984,7 +984,7 @@ bom { ] } } - library("Micrometer Tracing", "1.1.2-SNAPSHOT") { + library("Micrometer Tracing", "1.1.2") { group("io.micrometer") { imports = [ "micrometer-tracing-bom" From f299a2473ec4a0b87c31e2679630927e7a7ea01a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:35:39 +0200 Subject: [PATCH 15/16] Upgrade to Reactor Bom 2022.0.8 Closes gh-35747 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index cabf6336d30..c1f11402622 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1202,7 +1202,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.8-SNAPSHOT") { + library("Reactor Bom", "2022.0.8") { group("io.projectreactor") { imports = [ "reactor-bom" From 5853f344eb75873fdeda7f7d76601f0f1a2bf534 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 09:35:46 +0200 Subject: [PATCH 16/16] Upgrade to Tomcat 10.1.10 Closes gh-35886 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 996b28c36f1..6628170ba34 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.8.22 nativeBuildToolsVersion=0.9.22 springFrameworkVersion=6.0.10-SNAPSHOT -tomcatVersion=10.1.9 +tomcatVersion=10.1.10 kotlin.stdlib.default.dependency=false