From ec91b4c8b8cc9f80e64407bb3b16dd1b4da8216f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:02 +0100 Subject: [PATCH 01/10] Upgrade to Infinispan 14.0.31.Final Closes gh-42245 --- 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 272295df9e..b9e26f478b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -470,7 +470,7 @@ bom { ] } } - library("Infinispan", "14.0.30.Final") { + library("Infinispan", "14.0.31.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 216c69259e923a17cc74ec103741aad2a27b9633 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:07 +0100 Subject: [PATCH 02/10] Upgrade to Jakarta Servlet JSP JSTL 3.0.2 Closes gh-42246 --- 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 b9e26f478b..d138c64d37 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -554,7 +554,7 @@ bom { ] } } - library("Jakarta Servlet JSP JSTL", "3.0.1") { + library("Jakarta Servlet JSP JSTL", "3.0.2") { group("jakarta.servlet.jsp.jstl") { modules = [ "jakarta.servlet.jsp.jstl-api" From a6c93825409d4440776be359aee29f83f0866293 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:11 +0100 Subject: [PATCH 03/10] Upgrade to Jetty Reactive HTTPClient 4.0.7 Closes gh-42247 --- 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 d138c64d37..7cbb294610 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("Jetty Reactive HTTPClient", "4.0.6") { + library("Jetty Reactive HTTPClient", "4.0.7") { group("org.eclipse.jetty") { modules = [ "jetty-reactive-httpclient" From d8748ec35d8d00bdead4d116d772eca268e1ecf0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:16 +0100 Subject: [PATCH 04/10] Upgrade to Jetty 12.0.13 Closes gh-42248 --- 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 7cbb294610..b1b2f0f964 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -687,7 +687,7 @@ bom { ] } } - library("Jetty", "12.0.12") { + library("Jetty", "12.0.13") { group("org.eclipse.jetty.ee10") { imports = [ "jetty-ee10-bom" From 6bced8fe56cf6d882ca0481634722050746c99fc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:16 +0100 Subject: [PATCH 05/10] Upgrade to Micrometer 1.12.10 Closes gh-42121 --- 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 b1b2f0f964..94d17f35c5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1004,7 +1004,7 @@ bom { ] } } - library("Micrometer", "1.12.10-SNAPSHOT") { + library("Micrometer", "1.12.10") { considerSnapshots() group("io.micrometer") { modules = [ From 4676ad4f4b0b63893c0de62d48b6b39ccfa90b5a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:17 +0100 Subject: [PATCH 06/10] Upgrade to Micrometer Tracing 1.2.10 Closes gh-42122 --- 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 94d17f35c5..e69af6752e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1017,7 +1017,7 @@ bom { ] } } - library("Micrometer Tracing", "1.2.10-SNAPSHOT") { + library("Micrometer Tracing", "1.2.10") { considerSnapshots() group("io.micrometer") { imports = [ From 7d22d7f9cf0a158dac8c86506a023c7dd9ce12bc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:22 +0100 Subject: [PATCH 07/10] Upgrade to MongoDB 4.11.4 Closes gh-42249 --- 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 e69af6752e..901259e972 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1032,7 +1032,7 @@ bom { ] } } - library("MongoDB", "4.11.3") { + library("MongoDB", "4.11.4") { group("org.mongodb") { modules = [ "bson", From e1724277af6184ce33614a1f80d9f710e112052c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:26 +0100 Subject: [PATCH 08/10] Upgrade to Netty 4.1.113.Final Closes gh-42250 --- 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 901259e972..64664e06ce 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1091,7 +1091,7 @@ bom { ] } } - library("Netty", "4.1.112.Final") { + library("Netty", "4.1.113.Final") { group("io.netty") { imports = [ "netty-bom" From c08c5ae5ed468bd783e7c3b56be93c52a310482f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:26 +0100 Subject: [PATCH 09/10] Upgrade to Reactor Bom 2023.0.10 Closes gh-42123 --- 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 64664e06ce..a68cf3ef2a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1391,7 +1391,7 @@ bom { ] } } - library("Reactor Bom", "2023.0.10-SNAPSHOT") { + library("Reactor Bom", "2023.0.10") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From e65cc54ec47c62e365771596222b8574c9032d2c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:05:31 +0100 Subject: [PATCH 10/10] Upgrade to Tomcat 10.1.29 Closes gh-42251 --- gradle.properties | 2 +- .../springframework/boot/web/embedded/tomcat/TldPatterns.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2407ea66ec..5f97dcf7a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.13-SNAPSHOT springFramework60xVersion=6.0.23 -tomcatVersion=10.1.28 +tomcatVersion=10.1.29 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java index eeb73d715b..69ab0f7854 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java @@ -106,6 +106,7 @@ final class TldPatterns { skipPatterns.add("tagsoup-*.jar"); skipPatterns.add("tomcat-api.jar"); skipPatterns.add("tomcat-coyote.jar"); + skipPatterns.add("tomcat-coyote-ffm.jar"); skipPatterns.add("tomcat-dbcp.jar"); skipPatterns.add("tomcat-i18n-*.jar"); skipPatterns.add("tomcat-jdbc.jar");