From ef0ec60fdfec3b8af29d07dfe04e5edaa4c6e746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:29:56 +0200 Subject: [PATCH 01/12] Upgrade to CycloneDX Maven Plugin 2.8.2 Closes gh-42631 --- 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 35754d31a1c..cc0c0bacdb6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -272,7 +272,7 @@ bom { ] } } - library("CycloneDX Maven Plugin", "2.8.1") { + library("CycloneDX Maven Plugin", "2.8.2") { group("org.cyclonedx") { plugins = [ "cyclonedx-maven-plugin" From 50f7978ae38ec770aa2994943cd9f7cb57211952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:01 +0200 Subject: [PATCH 02/12] Upgrade to Infinispan 15.0.10.Final Closes gh-42632 --- 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 cc0c0bacdb6..05abf0800e3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -600,7 +600,7 @@ bom { ] } } - library("Infinispan", "15.0.8.Final") { + library("Infinispan", "15.0.10.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 7718dd88dc7d81c07cfb4fa299a75ae6895c25be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:05 +0200 Subject: [PATCH 03/12] Upgrade to Jersey 3.1.9 Closes gh-42633 --- 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 05abf0800e3..fe7356c6763 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -877,7 +877,7 @@ bom { releaseNotes("https://github.com/redis/jedis/releases/tag/v{version}") } } - library("Jersey", "3.1.8") { + library("Jersey", "3.1.9") { group("org.glassfish.jersey") { imports = [ "jersey-bom" From 6e2d1cb4c699d6ac3609c887678beb3e69158543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:09 +0200 Subject: [PATCH 04/12] Upgrade to Jetty Reactive HTTPClient 4.0.8 Closes gh-42634 --- 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 fe7356c6763..86e9554de8e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -888,7 +888,7 @@ bom { releaseNotes("https://github.com/eclipse-ee4j/jersey/releases/tag/{version}") } } - library("Jetty Reactive HTTPClient", "4.0.7") { + library("Jetty Reactive HTTPClient", "4.0.8") { group("org.eclipse.jetty") { modules = [ "jetty-reactive-httpclient" From e7ded11ed5128e1eb70b2c01ff66dddc2d1d4ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:14 +0200 Subject: [PATCH 05/12] Upgrade to Jetty 12.0.14 Closes gh-42635 --- 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 86e9554de8e..5280787fcb8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -895,7 +895,7 @@ bom { ] } } - library("Jetty", "12.0.13") { + library("Jetty", "12.0.14") { group("org.eclipse.jetty.ee10") { imports = [ "jetty-ee10-bom" From 8cccbb03c364aa0943dafad15c39457e8dad404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:18 +0200 Subject: [PATCH 06/12] Upgrade to jOOQ 3.19.13 Closes gh-42636 --- 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 5280787fcb8..2d772daec2e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -918,7 +918,7 @@ bom { ] } } - library("jOOQ", "3.19.11") { + library("jOOQ", "3.19.13") { group("org.jooq") { modules = [ "jooq", From 3ffa37e1cb14b80ae96306e8912b373ae2d771bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:22 +0200 Subject: [PATCH 07/12] Upgrade to JUnit Jupiter 5.10.5 Closes gh-42637 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1dadc856be2..880b60fe74b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ graalVersion=22.3 hamcrestVersion=2.2 jacksonVersion=2.17.2 javaFormatVersion=0.0.43 -junitJupiterVersion=5.10.3 +junitJupiterVersion=5.10.5 kotlinVersion=1.9.25 mavenVersion=3.9.4 mockitoVersion=5.11.0 From 107ca496fc9ecbcebd7cc217a5c354ca37840519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:27 +0200 Subject: [PATCH 08/12] Upgrade to Logback 1.5.10 Closes gh-42638 --- .../spring-boot-dependencies/build.gradle | 2 +- .../logging/logback/LogbackLoggingSystem.java | 25 +++++++++++-------- .../logback/LogbackLoggingSystemTests.java | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2d772daec2e..7c462a6cf36 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.8") { + library("Logback", "1.5.10") { group("ch.qos.logback") { modules = [ "logback-classic", diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index cddd864a066..0f27d1dad17 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -84,17 +84,20 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF private static final String CONFIGURATION_FILE_PROPERTY = "logback.configurationFile"; - private static final LogLevels LEVELS = new LogLevels<>(); - - static { - LEVELS.map(LogLevel.TRACE, Level.TRACE); - LEVELS.map(LogLevel.TRACE, Level.ALL); - LEVELS.map(LogLevel.DEBUG, Level.DEBUG); - LEVELS.map(LogLevel.INFO, Level.INFO); - LEVELS.map(LogLevel.WARN, Level.WARN); - LEVELS.map(LogLevel.ERROR, Level.ERROR); - LEVELS.map(LogLevel.FATAL, Level.ERROR); - LEVELS.map(LogLevel.OFF, Level.OFF); + private static final LogLevels LEVELS = createLogLevels(); + + @SuppressWarnings("deprecation") + private static LogLevels createLogLevels() { + LogLevels levels = new LogLevels<>(); + levels.map(LogLevel.TRACE, Level.TRACE); + levels.map(LogLevel.TRACE, Level.ALL); + levels.map(LogLevel.DEBUG, Level.DEBUG); + levels.map(LogLevel.INFO, Level.INFO); + levels.map(LogLevel.WARN, Level.WARN); + levels.map(LogLevel.ERROR, Level.ERROR); + levels.map(LogLevel.FATAL, Level.ERROR); + levels.map(LogLevel.OFF, Level.OFF); + return levels; } private static final TurboFilter FILTER = new TurboFilter() { 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 65adc53a10f..7e98393139f 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 @@ -288,6 +288,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test + @Deprecated(since = "3.3.5", forRemoval = true) void getLoggerConfigurationForALL() { this.loggingSystem.beforeInitialize(); initialize(this.initializationContext, null, null); From 108d8fb76c7345a31413bede03e7bfb5fcecde4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:32 +0200 Subject: [PATCH 09/12] Upgrade to Netty 4.1.114.Final Closes gh-42639 --- 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 7c462a6cf36..f0922199a13 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.113.Final") { + library("Netty", "4.1.114.Final") { group("io.netty") { imports = [ "netty-bom" From 15b8fc3c2a005533e8df3b7d8ad91c988108b0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:36 +0200 Subject: [PATCH 10/12] Upgrade to Pooled JMS 3.1.7 Closes gh-42640 --- 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 f0922199a13..d42f673ee6e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1511,7 +1511,7 @@ bom { ] } } - library("Pooled JMS", "3.1.6") { + library("Pooled JMS", "3.1.7") { group("org.messaginghub") { modules = [ "pooled-jms" From abc23eeebcb8bf9b47d2d6a19191cb106c84e1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:41 +0200 Subject: [PATCH 11/12] Upgrade to R2DBC Postgresql 1.0.6.RELEASE Closes gh-42641 --- 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 d42f673ee6e..bd528cfbe05 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1647,7 +1647,7 @@ bom { releaseNotes("https://github.com/r2dbc/r2dbc-pool/releases/tag/v{version}") } } - library("R2DBC Postgresql", "1.0.5.RELEASE") { + library("R2DBC Postgresql", "1.0.6.RELEASE") { considerSnapshots() group("org.postgresql") { modules = [ From 6780cca46f7f2cd3e2037e38c565f18aeb85b8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 14 Oct 2024 12:30:45 +0200 Subject: [PATCH 12/12] Upgrade to Tomcat 10.1.31 Closes gh-42642 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 880b60fe74b..74a30f915c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.3 snakeYamlVersion=2.2 springFrameworkVersion=6.1.14-SNAPSHOT springFramework60xVersion=6.0.23 -tomcatVersion=10.1.30 +tomcatVersion=10.1.31 kotlin.stdlib.default.dependency=false