Merge branch '6.2.x'

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

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 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
 	}
 
 	/**
-	 * 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