Merge branch '6.2.x'

# Conflicts:
#	framework-platform/framework-platform.gradle

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();

framework-platform/framework-platform.gradle

@@ -12,7 +12,7 @@ dependencies {
 	api(platform("io.netty:netty-bom:4.2.2.Final"))
 	api(platform("io.projectreactor:reactor-bom:2025.0.0-SNAPSHOT"))
 	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:3.0.0-beta3"))
 	api(platform("org.assertj:assertj-bom:3.27.3"))
 	api(platform("org.eclipse.jetty:jetty-bom:12.1.0.beta0"))
@@ -20,7 +20,7 @@ dependencies {
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1"))
 	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"))
 	api(platform("tools.jackson:jackson-bom:3.0.0-rc5"))
 
 	constraints {

spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java

@@ -27,7 +27,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;
@@ -266,11 +265,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
 			if (value instanceof String string) {
 				return string;
 			}
-			ConversionService conversionService = super.source.getConversionService();
+			return super.source.getConversionService().convert(value, String.class);
-			if (conversionService == null) {
-				conversionService = DefaultConversionService.getSharedInstance();
-			}
-			return conversionService.convert(value, String.class);
 		}
 
 		@Override