From af4e3984c7e45b02996c5e1b10e0a4563931c79c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:17 +0100 Subject: [PATCH 01/13] Upgrade to Byte Buddy 1.14.15 Closes gh-40708 --- 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 b1ae28037c0..11ed3d15c35 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -123,7 +123,7 @@ bom { ] } } - library("Byte Buddy", "1.14.13") { + library("Byte Buddy", "1.14.15") { group("net.bytebuddy") { modules = [ "byte-buddy", From 9e3cb34927b67ff4fcb33e840c3dd987b187b3dc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:22 +0100 Subject: [PATCH 02/13] Upgrade to Dependency Management Plugin 1.1.5 Closes gh-40709 --- 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 11ed3d15c35..2b18e646006 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -221,7 +221,7 @@ bom { ] } } - library("Dependency Management Plugin", "1.1.4") { + library("Dependency Management Plugin", "1.1.5") { group("io.spring.gradle") { modules = [ "dependency-management-plugin" From 98ea21d1f2339baf15e3f09a7f68174664f969c5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:27 +0100 Subject: [PATCH 03/13] Upgrade to Hibernate 6.2.25.Final Closes gh-40710 --- 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 2b18e646006..92769c29a1c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -365,7 +365,7 @@ bom { ] } } - library("Hibernate", "6.2.24.Final") { + library("Hibernate", "6.2.25.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From e5944a7b11f5c947233c90f68de324c115ab48f0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:32 +0100 Subject: [PATCH 04/13] Upgrade to Infinispan 14.0.28.Final Closes gh-40711 --- 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 92769c29a1c..273e4c9fcb2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -453,7 +453,7 @@ bom { ] } } - library("Infinispan", "14.0.27.Final") { + library("Infinispan", "14.0.28.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From cec0c93a7bd85a07a4250e51b2ed0ef930d1bd57 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:37 +0100 Subject: [PATCH 05/13] Upgrade to jOOQ 3.18.15 Closes gh-40712 --- 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 273e4c9fcb2..2cfa4501e0f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -680,7 +680,7 @@ bom { ] } } - library("jOOQ", "3.18.14") { + library("jOOQ", "3.18.15") { group("org.jooq") { modules = [ "jooq", From 6ee06de5bfaaa1e4fa7f8e1cbe2caf903a7c75e5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:42 +0100 Subject: [PATCH 06/13] Upgrade to Maven Deploy Plugin 3.1.2 Closes gh-40713 --- 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 2cfa4501e0f..5c52b228557 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -884,7 +884,7 @@ bom { ] } } - library("Maven Deploy Plugin", "3.1.1") { + library("Maven Deploy Plugin", "3.1.2") { group("org.apache.maven.plugins") { plugins = [ "maven-deploy-plugin" From 8ddfc4029a7eb8183a22811f5f5a04fd771a1e73 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:47 +0100 Subject: [PATCH 07/13] Upgrade to Maven Install Plugin 3.1.2 Closes gh-40714 --- 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 5c52b228557..4f403709b24 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -912,7 +912,7 @@ bom { ] } } - library("Maven Install Plugin", "3.1.1") { + library("Maven Install Plugin", "3.1.2") { group("org.apache.maven.plugins") { plugins = [ "maven-install-plugin" From 8064a962c293a5892fef2bcc1ab17cd1560a0456 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:48 +0100 Subject: [PATCH 08/13] Upgrade to Micrometer 1.11.12 Closes gh-40646 --- 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 4f403709b24..eeb96619f68 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -975,7 +975,7 @@ bom { ] } } - library("Micrometer", "1.11.12-SNAPSHOT") { + library("Micrometer", "1.11.12") { considerSnapshots() group("io.micrometer") { modules = [ From 0b292ca0d1a2ee7fc00868d6e13fbf772076b68b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:53 +0100 Subject: [PATCH 09/13] Upgrade to Micrometer Tracing 1.1.13 Closes gh-40715 --- 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 eeb96619f68..10d42d938c4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -988,7 +988,7 @@ bom { ] } } - library("Micrometer Tracing", "1.1.12") { + library("Micrometer Tracing", "1.1.13") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From 9a0a34082cc70d2e2ee0ec71517037cd24ac2027 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:27:58 +0100 Subject: [PATCH 10/13] Upgrade to Pooled JMS 3.1.6 Closes gh-40716 --- 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 10d42d938c4..ec255a4934a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1152,7 +1152,7 @@ bom { ] } } - library("Pooled JMS", "3.1.5") { + library("Pooled JMS", "3.1.6") { group("org.messaginghub") { modules = [ "pooled-jms" From f633d25626d0ba5e48cc6d22a8887d07d0d968be Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:28:03 +0100 Subject: [PATCH 11/13] Upgrade to R2DBC Proxy 1.1.5.RELEASE Closes gh-40717 --- 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 ec255a4934a..5d26f3a8ff0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1236,7 +1236,7 @@ bom { ] } } - library("R2DBC Proxy", "1.1.4.RELEASE") { + library("R2DBC Proxy", "1.1.5.RELEASE") { considerSnapshots() group("io.r2dbc") { modules = [ From c35da125a44fd1af46536b9b6fc57907ddb32760 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:28:08 +0100 Subject: [PATCH 12/13] Upgrade to Tomcat 10.1.23 Closes gh-40718 --- gradle.properties | 2 +- .../spring-boot-starter-tomcat/build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 21d74e232e9..9827adeb34b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ kotlinVersion=1.8.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.0.20-SNAPSHOT -tomcatVersion=10.1.20 +tomcatVersion=10.1.23 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle index f859ef7daee..acfe9c3ba37 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle @@ -12,5 +12,6 @@ dependencies { api("org.apache.tomcat.embed:tomcat-embed-el") api("org.apache.tomcat.embed:tomcat-embed-websocket") { exclude group: "org.apache.tomcat", module: "tomcat-annotations-api" + exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" } } From e14caf3d3258c95b80d199b629e3839b369bf8c9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 12:28:13 +0100 Subject: [PATCH 13/13] Upgrade to Undertow 2.3.13.Final Closes gh-40719 --- 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 5d26f3a8ff0..f50a338f8f0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1636,7 +1636,7 @@ bom { ] } } - library("Undertow", "2.3.12.Final") { + library("Undertow", "2.3.13.Final") { group("io.undertow") { modules = [ "undertow-core",