From d9c103b7ffd74e6deccca8f137bfd2817d09138c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 6 Jun 2025 09:21:21 +0200 Subject: [PATCH 1/2] Remove unnecessary fallback to DefaultConversionService See gh-34936 --- .../support/PropertySourcesPlaceholderConfigurer.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java index 97bbfc32ba..3043c47f19 100644 --- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java +++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.PlaceholderConfigurerSupport; import org.springframework.context.EnvironmentAware; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurablePropertyResolver; import org.springframework.core.env.Environment; @@ -270,11 +269,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS if (value instanceof String string) { return string; } - ConversionService conversionService = super.source.getConversionService(); - if (conversionService == null) { - conversionService = DefaultConversionService.getSharedInstance(); - } - return conversionService.convert(value, String.class); + return super.source.getConversionService().convert(value, String.class); } @Override From 9f76ea13e3615dccae2866f7139c9c1a16fcb0ff Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 6 Jun 2025 09:21:37 +0200 Subject: [PATCH 2/2] Upgrade to Groovy 4.0.27, Mockito 5.18, Checkstyle 10.25 --- .../java/org/springframework/build/CheckstyleConventions.java | 2 +- framework-platform/framework-platform.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index b35b3e3b5d..5e61f5c8df 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -50,7 +50,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("10.23.1"); + checkstyle.setToolVersion("10.25.0"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 1404b2cc85..d9304fe7e2 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -13,7 +13,7 @@ dependencies { api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2024.0.6")) api(platform("io.rsocket:rsocket-bom:1.1.5")) - api(platform("org.apache.groovy:groovy-bom:4.0.26")) + api(platform("org.apache.groovy:groovy-bom:4.0.27")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) api(platform("org.assertj:assertj-bom:3.27.3")) api(platform("org.eclipse.jetty:jetty-bom:12.0.21")) @@ -21,7 +21,7 @@ dependencies { api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3")) api(platform("org.junit:junit-bom:5.13.0")) - api(platform("org.mockito:mockito-bom:5.17.0")) + api(platform("org.mockito:mockito-bom:5.18.0")) constraints { api("com.fasterxml:aalto-xml:1.3.2")