Update deprecation notices

See gh-33123

Author: rstoyanchev

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -39,6 +39,8 @@
  * @author Arjen Poutsma
  * @author Roy Clarkson
  * @since 4.3
+ * @deprecated since 6.1, in favor of other HTTP client libraries;
+ * scheduled for removal in 7.0
  */
 @Deprecated(since = "6.1", forRemoval = true)
 class OkHttp3ClientHttpRequest extends AbstractStreamingClientHttpRequest {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -36,8 +36,8 @@
  * @author Arjen Poutsma
  * @author Roy Clarkson
  * @since 4.3
- * @deprecated since 6.1, in favor of other {@link ClientHttpRequestFactory}
- * implementations; scheduled for removal in 6.2
+ * @deprecated since 6.1, in favor of other {@link ClientHttpRequestFactory} implementations;
+ * scheduled for removal in 7.0
  */
 @Deprecated(since = "6.1", forRemoval = true)
 public class OkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, DisposableBean {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -34,6 +34,8 @@
  * @author Arjen Poutsma
  * @author Roy Clarkson
  * @since 4.3
+ * @deprecated since 6.1, in favor of other HTTP client libraries;
+ * scheduled for removal in 7.0
  */
 @Deprecated(since = "6.1", forRemoval = true)
 class OkHttp3ClientHttpResponse implements ClientHttpResponse {

spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java

@@ -265,7 +265,7 @@ public static UriComponentsBuilder fromUriString(String uri) throws InvalidUrlEx
 	 * @param httpUrl the source URI
 	 * @return the URI components of the URI
 	 * @deprecated as of 6.2, in favor of {@link #fromUriString(String)};
-	 * scheduled for removal in 8.0.
+	 * scheduled for removal in 7.0.
 	 */
 	@Deprecated(since = "6.2")
 	public static UriComponentsBuilder fromHttpUrl(String httpUrl) throws InvalidUrlException {
@@ -291,7 +291,7 @@ private static void checkSchemeAndHost(String uri, @Nullable String scheme, @Nul
 	 * @return the URI components of the URI
 	 * @since 4.1.5
 	 * @deprecated in favor of {@link ForwardedHeaderUtils#adaptFromForwardedHeaders};
-	 * to be removed in 6.2
+	 * to be removed in 7.0
 	 */
 	@Deprecated(since = "6.1", forRemoval = true)
 	public static UriComponentsBuilder fromHttpRequest(HttpRequest request) {