From b63f78c4fd4e8ac27a6d7f05ea4a689347d53d66 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:26:51 +0100 Subject: [PATCH 01/13] Upgrade to Zipkin Reporter 3.4.1 Closes gh-42252 --- 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 33ff87a4e5..8534ed5a7b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -103,7 +103,7 @@ bom { .formatted(version.major(), version.minor()) } } } - library("Zipkin Reporter", "3.4.0") { + library("Zipkin Reporter", "3.4.1") { group("io.zipkin.reporter2") { imports = [ "zipkin-reporter-bom" From ad78f8f82337cc2752821d04eb8a293d75d1a8ed Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:26:56 +0100 Subject: [PATCH 02/13] Upgrade to Infinispan 15.0.8.Final Closes gh-42253 --- 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 8534ed5a7b..55d22f4978 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -601,7 +601,7 @@ bom { ] } } - library("Infinispan", "15.0.7.Final") { + library("Infinispan", "15.0.8.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From ef63f1799f442ea823da5375aaea845feb843a65 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:00 +0100 Subject: [PATCH 03/13] Upgrade to Jakarta Servlet JSP JSTL 3.0.2 Closes gh-42254 --- 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 55d22f4978..a29fd63ed7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -747,7 +747,7 @@ bom { .formatted(version.major(), version.minor()) } } } - 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 a7f74aae36558d84040c96d0c7dcfc98dfbac36a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:05 +0100 Subject: [PATCH 04/13] Upgrade to Jetty Reactive HTTPClient 4.0.7 Closes gh-42255 --- 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 a29fd63ed7..2583914cd4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -889,7 +889,7 @@ bom { releaseNotes("https://github.com/eclipse-ee4j/jersey/releases/tag/{version}") } } - library("Jetty Reactive HTTPClient", "4.0.6") { + library("Jetty Reactive HTTPClient", "4.0.7") { group("org.eclipse.jetty") { modules = [ "jetty-reactive-httpclient" From 9794dc3480e2dfc7188d6b6162b2e41a3cd7630f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:10 +0100 Subject: [PATCH 05/13] Upgrade to Jetty 12.0.13 Closes gh-42256 --- 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 2583914cd4..adc9eda600 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -896,7 +896,7 @@ bom { ] } } - library("Jetty", "12.0.12") { + library("Jetty", "12.0.13") { group("org.eclipse.jetty.ee10") { imports = [ "jetty-ee10-bom" From 6c2fa2fab06ac7c6f68a9d37f004a25d7cc0a88f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:15 +0100 Subject: [PATCH 06/13] Upgrade to Logback 1.5.8 Closes gh-42257 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../boot/logging/logback/LogbackLoggingSystemTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index adc9eda600..2877e70dea 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1121,7 +1121,7 @@ bom { releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}") } } - library("Logback", "1.5.7") { + library("Logback", "1.5.8") { group("ch.qos.logback") { modules = [ "logback-classic", diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java index 0c978d8789..65adc53a10 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java @@ -646,7 +646,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { LogFile logFile = getLogFile(file.getPath(), null); initialize(this.initializationContext, null, logFile); assertThat(output).contains("LevelChangePropagator") - .contains("SizeAndTimeBasedFNATP") + .contains("SizeAndTimeBasedFileNamingAndTriggeringPolicy") .contains("DebugLogbackConfigurator"); } finally { From b570c030441990d236dfd37105e41fec04923330 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:16 +0100 Subject: [PATCH 07/13] Upgrade to Micrometer 1.13.4 Closes gh-42129 --- 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 2877e70dea..f7163da994 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1280,7 +1280,7 @@ bom { ] } } - library("Micrometer", "1.13.4-SNAPSHOT") { + library("Micrometer", "1.13.4") { considerSnapshots() group("io.micrometer") { modules = [ From a08d173b9958c4bacc626e23d55f6a2e51479733 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:16 +0100 Subject: [PATCH 08/13] Upgrade to Micrometer Tracing 1.3.4 Closes gh-42130 --- 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 f7163da994..9a65b72088 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1300,7 +1300,7 @@ bom { releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}") } } - library("Micrometer Tracing", "1.3.4-SNAPSHOT") { + library("Micrometer Tracing", "1.3.4") { considerSnapshots() group("io.micrometer") { imports = [ From 2975661b41f0ca8520db3f56c3769b0e8b8d31a7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:21 +0100 Subject: [PATCH 09/13] Upgrade to MSSQL JDBC 12.6.4.jre11 Closes gh-42258 --- 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 9a65b72088..6eb82c2911 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1342,7 +1342,7 @@ bom { releaseNotes("https://github.com/mongodb/mongo-java-driver/releases/tag/r{version}") } } - library("MSSQL JDBC", "12.6.3.jre11") { + library("MSSQL JDBC", "12.6.4.jre11") { prohibit { endsWith(".jre8") because "we want to use the jre11 version" From a253a24228c3886eb44335843e60f9b8be50a99f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:25 +0100 Subject: [PATCH 10/13] Upgrade to Netty 4.1.113.Final Closes gh-42259 --- 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 6eb82c2911..4f83eacd09 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1410,7 +1410,7 @@ bom { releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}") } } - library("Netty", "4.1.112.Final") { + library("Netty", "4.1.113.Final") { group("io.netty") { imports = [ "netty-bom" From 11bd835b5a44a5b5ec6798ab8aced70328d8701f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:30 +0100 Subject: [PATCH 11/13] Upgrade to Postgresql 42.7.4 Closes gh-42260 --- 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 4f83eacd09..9e5cbfa765 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1518,7 +1518,7 @@ bom { ] } } - library("Postgresql", "42.7.3") { + library("Postgresql", "42.7.4") { group("org.postgresql") { modules = [ "postgresql" From 1503b8db8fcf8bd5d5dc87dbdc779a3b1ff90793 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:30 +0100 Subject: [PATCH 12/13] Upgrade to Reactor Bom 2023.0.10 Closes gh-42131 --- 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 9e5cbfa765..e50d1b812c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1704,7 +1704,7 @@ bom { ] } } - library("Reactor Bom", "2023.0.10-SNAPSHOT") { + library("Reactor Bom", "2023.0.10") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From b2edefe982c75af7dd958a88bce15076c4a1dc29 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 13:27:35 +0100 Subject: [PATCH 13/13] Upgrade to Tomcat 10.1.29 Closes gh-42261 --- 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 a7cb98e6cc..2341ef0c79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ mavenVersion=3.9.4 nativeBuildToolsVersion=0.10.3 springFrameworkVersion=6.1.13-SNAPSHOT springFramework60xVersion=6.0.23 -tomcatVersion=10.1.28 +tomcatVersion=10.1.29 snakeYamlVersion=2.2 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");