Start building against Spring Framework 6.2.13 snapshots

See gh-48025
Closes gh-48032

Author: wilkinsona

gradle.properties

@@ -19,7 +19,7 @@ mavenVersion=3.9.4
 mockitoVersion=5.14.2
 nativeBuildToolsVersion=0.10.6
 snakeYamlVersion=2.3
-springFrameworkVersion=6.2.12
+springFrameworkVersion=6.2.13-SNAPSHOT
 springFramework60xVersion=6.0.23
 tomcatVersion=10.1.48
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java

@@ -123,12 +123,22 @@ private Method findMethod(ClientHttpRequestFactory requestFactory, String method
 		Method method = ReflectionUtils.findMethod(requestFactory.getClass(), methodName, parameters);
 		Assert.state(method != null, () -> "Request factory %s does not have a suitable %s method"
 			.formatted(requestFactory.getClass().getName(), methodName));
-		Assert.state(!method.isAnnotationPresent(Deprecated.class),
-				() -> "Request factory %s has the %s method marked as deprecated"
-					.formatted(requestFactory.getClass().getName(), methodName));
+		String requestFactoryClassName = requestFactory.getClass().getName();
+		Assert.state(
+				!method.isAnnotationPresent(Deprecated.class)
+						|| isPermittedDeprecatedMethod(requestFactory, methodName),
+				() -> "Request factory %s has the %s method marked as deprecated".formatted(requestFactoryClassName,
+						methodName));
 		return method;
 	}
 
+	private boolean isPermittedDeprecatedMethod(ClientHttpRequestFactory requestFactory, String methodName) {
+		String requestFactoryClassName = requestFactory.getClass().getName();
+		return "setConnectTimeout".equals(methodName)
+				&& "org.springframework.http.client.HttpComponentsClientHttpRequestFactory"
+					.equals(requestFactoryClassName);
+	}
+
 	private Method tryFindMethod(ClientHttpRequestFactory requestFactory, String methodName, Class<?>... parameters) {
 		Method method = ReflectionUtils.findMethod(requestFactory.getClass(), methodName, parameters);
 		if (method == null) {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java

@@ -37,7 +37,7 @@ class PatternParseFailureAnalyzerTests {
 	void patternParseFailureQuotesPattern() {
 		FailureAnalysis failureAnalysis = performAnalysis("/spring/**/framework");
 		assertThat(failureAnalysis.getDescription())
-			.contains("Invalid mapping pattern detected:\n" + "/spring/**/framework\n" + "       ^");
+			.contains("Invalid mapping pattern detected:\n" + "/spring/**/framework\n" + "        ^");
 		assertThat(failureAnalysis.getAction())
 			.contains("Fix this pattern in your application or switch to the legacy parser"
 					+ " implementation with 'spring.mvc.pathmatch.matching-strategy=ant_path_matcher'.");