Merge branch '6.2.x'

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

Author: jhoeller

buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

@@ -50,7 +50,7 @@ public void apply(Project project) {
 			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.0");
+			checkstyle.setToolVersion("10.23.1");
 			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

@@ -7,9 +7,9 @@ javaPlatform {
 }
 
 dependencies {
-	api(platform("com.fasterxml.jackson:jackson-bom:2.18.3"))
+	api(platform("com.fasterxml.jackson:jackson-bom:2.18.4"))
 	api(platform("io.micrometer:micrometer-bom:1.15.0-RC1"))
-	api(platform("io.netty:netty-bom:4.1.119.Final"))
+	api(platform("io.netty:netty-bom:4.1.121.Final"))
 	api(platform("io.projectreactor:reactor-bom:2025.0.0-M2"))
 	api(platform("io.rsocket:rsocket-bom:1.1.5"))
 	api(platform("org.apache.groovy:groovy-bom:4.0.26"))
@@ -97,7 +97,7 @@ dependencies {
 		api("org.apache.derby:derby:10.16.1.1")
 		api("org.apache.derby:derbyclient:10.16.1.1")
 		api("org.apache.derby:derbytools:10.16.1.1")
-		api("org.apache.httpcomponents.client5:httpclient5:5.4.3")
+		api("org.apache.httpcomponents.client5:httpclient5:5.4.4")
 		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.4")
 		api("org.apache.poi:poi-ooxml:5.2.5")
 		api("org.apache.tomcat.embed:tomcat-embed-core:11.0.5")

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

@@ -229,7 +229,6 @@ private static class ConfigurableEnvironmentPropertySource extends PropertySourc
 			super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment);
 		}
 
-
 		@Override
 		public boolean containsProperty(String name) {
 			for (PropertySource<?> propertySource : super.source.getPropertySources()) {
@@ -257,6 +256,7 @@ public String toString() {
 		}
 	}
 
+
 	/**
 	 * Fallback {@link PropertySource} that delegates to a raw {@link Environment}.
 	 * <p>Should never apply in a regular scenario, since the {@code Environment}
@@ -269,7 +269,6 @@ private static class FallbackEnvironmentPropertySource extends PropertySource<En
 			super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment);
 		}
 
-
 		@Override
 		public boolean containsProperty(String name) {
 			return super.source.containsProperty(name);

spring-core/src/main/java/org/springframework/core/env/CompositePropertySource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-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.
@@ -35,7 +35,10 @@
  *
  * <p>As of Spring 4.1.2, this class extends {@link EnumerablePropertySource} instead
  * of plain {@link PropertySource}, exposing {@link #getPropertyNames()} based on the
- * accumulated property names from all contained sources (as far as possible).
+ * accumulated property names from all contained sources - and failing with an
+ * {@code IllegalStateException} against any non-{@code EnumerablePropertySource}.
+ * <b>When used through the {@code EnumerablePropertySource} contract, all contained
+ * sources are expected to be of type {@code EnumerablePropertySource} as well.</b>
  *
  * @author Chris Beams
  * @author Juergen Hoeller

spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-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.
@@ -74,6 +74,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
 
 	private long readTimeout = -1;
 
+
 	/**
 	 * Create a new instance of the {@code HttpComponentsClientHttpRequestFactory}
 	 * with a default {@link HttpClient} based on system properties.
@@ -357,7 +358,7 @@ protected void postProcessHttpRequest(ClassicHttpRequest request) {
 	}
 
 	/**
-	 * Template methods that creates a {@link HttpContext} for the given HTTP method and URI.
+	 * Template method that creates a {@link HttpContext} for the given HTTP method and URI.
 	 * <p>The default implementation returns {@code null}.
 	 * @param httpMethod the HTTP method
 	 * @param uri the URI