From c80c08d7bd846462c2af922c313e96d3b6b1a0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Feb 2025 12:28:08 +0100 Subject: [PATCH 1/5] Upgrade to Commons Pool2 2.12.1 Closes gh-44138 --- 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 e9e32fd436e..5e9896492b4 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 3e4a799bb95b3cbe1d53280f9ae6574a2812c187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Feb 2025 12:28:12 +0100 Subject: [PATCH 2/5] Upgrade to Groovy 4.0.25 Closes gh-44139 --- 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 5e9896492b4..368968bd235 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -454,7 +454,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 fcd33e8b3021c166852e3f930cf3b3604868cecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Feb 2025 12:28:16 +0100 Subject: [PATCH 3/5] Upgrade to Infinispan 15.0.13.Final Closes gh-44140 --- 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 368968bd235..bcb4337636d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -623,7 +623,7 @@ bom { ] } } - library("Infinispan", "15.0.12.Final") { + library("Infinispan", "15.0.13.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From b46698774d8f4742718bae05c43eef22e33f9e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Feb 2025 12:28:20 +0100 Subject: [PATCH 4/5] Upgrade to Native Build Tools Plugin 0.10.5 Closes gh-44141 --- gradle.properties | 2 +- .../boot/gradle/testkit/PluginClasspathGradleBuild.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 854d4c92235..2667fc40ce8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ junitJupiterVersion=5.10.5 kotlinVersion=1.9.25 mavenVersion=3.9.4 mockitoVersion=5.11.0 -nativeBuildToolsVersion=0.10.4 +nativeBuildToolsVersion=0.10.5 snakeYamlVersion=2.2 springFrameworkVersion=6.1.17-SNAPSHOT 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 f5a9e6029eb..0197098a044 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; -import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.core.Versioned; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; @@ -86,8 +85,9 @@ 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(JsonView.class)), new File(pathOfJarContaining(Platform.class)), - new File(pathOfJarContaining(Toml.class)), new File(pathOfJarContaining(Lexer.class)), + new File(pathOfJarContaining("com.github.openjson.JSONObject")), + new File(pathOfJarContaining(Platform.class)), new File(pathOfJarContaining(Toml.class)), + new File(pathOfJarContaining(Lexer.class)), new File(pathOfJarContaining("org.graalvm.buildtools.gradle.NativeImagePlugin")), new File(pathOfJarContaining("org.graalvm.reachability.GraalVMReachabilityMetadataRepository")), new File(pathOfJarContaining("org.graalvm.buildtools.utils.SharedConstants"))); From dbc61d39f0c0ea840011687c20fbac6564ca57eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Feb 2025 12:28:20 +0100 Subject: [PATCH 5/5] Upgrade to RSocket 1.1.5 Closes gh-44041 --- 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 bcb4337636d..b99cd9fd12c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1916,11 +1916,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"