Merge branch '2.3.x' into 2.4.x

See gh-25825
spring-projects · Mar 30, 2021 · d9ce30b · d9ce30b
2 parents a0f5169 + 8b6eef6
commit d9ce30b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java b/...java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java
@@ -110,7 +110,7 @@ private CachedResponse createCachedResponse(Object response, long accessTime) {
 	 * @param timeToLive the maximum time in milliseconds that a response can be cached
 	 * @return a caching version of the invoker or the original instance if caching is not
 	 * required
-	 * @deprecated as of 2.3 to make package-private in 2.4
+	 * @deprecated since 2.3 for removal in 2.5
 	 */
 	@Deprecated
 	public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) {

diff --git a/...rg/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java b/...rg/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java
@@ -25,7 +25,7 @@
  *
  * @author Brian Clozel
  * @since 2.1.0
- * @deprecated as of 2.3.1 for removal in 2.5 in favor of
+ * @deprecated since 2.3.1 for removal in 2.5 in favor of
  * {@link org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCustomizer}
  */
 @FunctionalInterface