Merge branch '6.0.x'

spring-core/src/main/java/org/springframework/util/Base64Utils.java

@@ -27,7 +27,8 @@ import java.util.Base64;
  * @author Gary Russell
  * @since 4.1
  * @see java.util.Base64
- * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}.
+ * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled
+ * for removal in 6.2
  */
 @Deprecated(since = "6.0.5", forRemoval = true)
 public abstract class Base64Utils {

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

@@ -25,7 +25,7 @@ import org.springframework.http.HttpStatusCode;
  *
  * @author Arjen Poutsma
  * @since 3.1.1
- * @deprecated as of 6.0, with no direct replacement
+ * @deprecated as of 6.0, with no direct replacement; scheduled for removal in 6.2
  */
 @Deprecated(since = "6.0", forRemoval = true)
 public abstract class AbstractClientHttpResponse implements ClientHttpResponse {

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

@@ -48,7 +48,8 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable {
 	 * @throws IOException in case of I/O errors
 	 * @since 3.1.1
 	 * @see #getStatusCode()
-	 * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
+	 * @deprecated as of 6.0, in favor of {@link #getStatusCode()}; scheduled for
+	 * removal in 6.2
 	 */
 	@Deprecated(since = "6.0", forRemoval = true)
 	default int getRawStatusCode() throws IOException {

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

@@ -139,8 +139,9 @@ public enum ClientHttpObservationDocumentation implements ObservationDocumentati
 
 		/**
 		 * Client name derived from the request URI host.
-		 * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}.
+		 * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME};
-		 * This will be available both as a low and high cardinality key value.
+		 * scheduled for removal in 6.2. This will be available both as a low and
+		 * high cardinality key value.
 		 */
 		@Deprecated(since = "6.0.5", forRemoval = true)
 		CLIENT_NAME {

spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientHttpObservationDocumentation.java

@@ -136,8 +136,9 @@ public enum ClientHttpObservationDocumentation implements ObservationDocumentati
 
 		/**
 		 * Client name derived from the request URI host.
-		 * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}.
+		 * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME};
-		 * This will be available both as a low and high cardinality key value.
+		 * scheduled for removal in 6.2. This will be available both as a low and
+		 * high cardinality key value.
 		 */
 		@Deprecated(since = "6.0.5", forRemoval = true)
 		CLIENT_NAME {