From 16467c4f9058a566745f924ef43c9ec0637c2b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:44:46 +0100 Subject: [PATCH 01/10] Upgrade to Commons Pool2 2.12.1 Closes gh-44173 --- 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 2762861108..4bafd718b5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -244,7 +244,7 @@ bom { ] } } - library("Commons Pool2", "2.12.0") { + library("Commons Pool2", "2.12.1") { group("org.apache.commons") { modules = [ "commons-pool2" From f3de1a121ff59168449b3f73585f0f496c314d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:44:50 +0100 Subject: [PATCH 02/10] Upgrade to Groovy 4.0.25 Closes gh-44174 --- 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 4bafd718b5..dd917029e0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -455,7 +455,7 @@ bom { releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}") } } - library("Groovy", "4.0.24") { + library("Groovy", "4.0.25") { group("org.apache.groovy") { imports = [ "groovy-bom" From 54a11aba6e526f59c7d4f08a773fda8ff6c987c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:44:54 +0100 Subject: [PATCH 03/10] Upgrade to Hibernate 6.6.6.Final Closes gh-44175 --- 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 dd917029e0..fcd3a9cc43 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -514,7 +514,7 @@ bom { releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}") } } - library("Hibernate", "6.6.5.Final") { + library("Hibernate", "6.6.6.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From 75c06f224c8b914fbf11039138ad6413f3929636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:44:58 +0100 Subject: [PATCH 04/10] Upgrade to HttpClient5 5.4.2 Closes gh-44176 --- 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 fcd3a9cc43..dc72589aaa 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -598,7 +598,7 @@ bom { ] } } - library("HttpClient5", "5.4.1") { + library("HttpClient5", "5.4.2") { group("org.apache.httpcomponents.client5") { modules = [ "httpclient5", From 15099d0755002004ec4e2b2dffeb1d8edd62d7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:45:02 +0100 Subject: [PATCH 05/10] Upgrade to HttpCore5 5.3.3 Closes gh-44177 --- 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 dc72589aaa..bc060568c4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -615,7 +615,7 @@ bom { ] } } - library("HttpCore5", "5.3.2") { + library("HttpCore5", "5.3.3") { group("org.apache.httpcomponents.core5") { modules = [ "httpcore5", From 08e5578157caebc419d1704ca70e6649c3a613be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:45:06 +0100 Subject: [PATCH 06/10] Upgrade to Infinispan 15.0.13.Final Closes gh-44178 --- 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 bc060568c4..db919be7f9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -624,7 +624,7 @@ bom { ] } } - library("Infinispan", "15.0.12.Final") { + library("Infinispan", "15.0.13.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From ff6168cde7fae9f6be29abb8a550dc088e12b0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:45:10 +0100 Subject: [PATCH 07/10] Upgrade to Native Build Tools Plugin 0.10.5 Closes gh-44179 --- gradle.properties | 2 +- .../boot/gradle/testkit/PluginClasspathGradleBuild.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1989e48255..3e7736ccac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ junitJupiterVersion=5.11.4 kotlinVersion=1.9.25 mavenVersion=3.9.4 mockitoVersion=5.14.2 -nativeBuildToolsVersion=0.10.4 +nativeBuildToolsVersion=0.10.5 snakeYamlVersion=2.3 springFrameworkVersion=6.2.2 springFramework60xVersion=6.0.23 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java index 6b5c2d4cf3..14d1700b43 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java @@ -86,6 +86,7 @@ public class PluginClasspathGradleBuild extends GradleBuild { new File(pathOfJarContaining(HttpVersionPolicy.class)), new File(pathOfJarContaining(Module.class)), new File(pathOfJarContaining(Versioned.class)), new File(pathOfJarContaining(ParameterNamesModule.class)), + new File(pathOfJarContaining("com.github.openjson.JSONObject")), new File(pathOfJarContaining(JsonView.class)), new File(pathOfJarContaining(Platform.class)), new File(pathOfJarContaining(Toml.class)), new File(pathOfJarContaining(Lexer.class)), new File(pathOfJarContaining("org.graalvm.buildtools.gradle.NativeImagePlugin")), From e91705a04d0b3d4fcfd059dbeebab6da20f31954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:45:14 +0100 Subject: [PATCH 08/10] Upgrade to R2DBC MySQL 1.3.2 Closes gh-44180 --- 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 db919be7f9..772b8e8ef7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1789,7 +1789,7 @@ bom { releaseNotes("https://github.com/r2dbc/r2dbc-mssql/releases/tag/v{version}") } } - library("R2DBC MySQL", "1.3.1") { + library("R2DBC MySQL", "1.3.2") { group("io.asyncer") { modules = [ "r2dbc-mysql" From c1cda666e7f936bd7895d6cc7ade78083f2ad7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:45:18 +0100 Subject: [PATCH 09/10] Upgrade to RSocket 1.1.5 Closes gh-44181 --- spring-boot-project/spring-boot-dependencies/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 772b8e8ef7..9e6999b728 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1899,11 +1899,7 @@ bom { javadoc("https://javadoc.io/doc/io.rest-assured/rest-assured/{version}", "io.restassured") } } - library("RSocket", "1.1.3") { - prohibit { - versionRange "[1.1.4]" - because "it contains a regression (https://github.com/rsocket/rsocket-java/issues/1092)" - } + library("RSocket", "1.1.5") { group("io.rsocket") { imports = [ "rsocket-bom" From fafcfb41c88634496fe8d78e94a7211bb9908f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Feb 2025 15:45:22 +0100 Subject: [PATCH 10/10] Upgrade to Testcontainers Redis Module 2.2.3 Closes gh-44182 --- 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 9e6999b728..ab807bc662 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2377,7 +2377,7 @@ bom { releaseNotes("https://github.com/testcontainers/testcontainers-java/releases/tag/{version}") } } - library("Testcontainers Redis Module", "2.2.2") { + library("Testcontainers Redis Module", "2.2.3") { group("com.redis") { modules = [ "testcontainers-redis"