Merge branch '2.4.x'

Closes gh-25826

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -32,7 +32,8 @@ import org.springframework.util.Assert;
  * @author Julien Dubois
  * @author Alexandre Dutra
  * @since 2.0.0
- * @deprecated since 2.4.0 in favor of {@link CassandraDriverHealthIndicator}
+ * @deprecated since 2.4 for removal in 2.6 in favor of
+ * {@link CassandraDriverHealthIndicator}
  */
 @Deprecated
 public class CassandraHealthIndicator extends AbstractHealthIndicator {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -31,7 +31,8 @@ import org.springframework.util.Assert;
  *
  * @author Artsiom Yudovin
  * @since 2.1.0
- * @deprecated since 2.4.0 in favor of {@link CassandraDriverHealthIndicator}
+ * @deprecated since 2.4 for removal in 2.6 in favor of
+ * {@link CassandraDriverHealthIndicator}
  */
 @Deprecated
 public class CassandraReactiveHealthIndicator extends AbstractReactiveHealthIndicator {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InvocationContext.java

@@ -56,7 +56,7 @@ public class InvocationContext {
 	 * @param securityContext the current security context. Never {@code null}
 	 * @param arguments the arguments available to the operation. Never {@code null}
 	 * @since 2.2.0
-	 * @deprecated since 2.5.0 in favor of
+	 * @deprecated since 2.5 for removal in 2.7 in favor of
 	 * {@link #InvocationContext(SecurityContext, Map, OperationArgumentResolver[])}
 	 */
 	@Deprecated
@@ -98,7 +98,8 @@ public class InvocationContext {
 	/**
 	 * Return the security context to use for the invocation.
 	 * @return the security context
-	 * @deprecated since 2.5.0 in favor of {@link #resolveArgument(Class)}
+	 * @deprecated since 2.5 for removal in 2.7 in favor of
+	 * {@link #resolveArgument(Class)}
 	 */
 	@Deprecated
 	public SecurityContext getSecurityContext() {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ApiVersion.java

@@ -66,8 +66,8 @@ public enum ApiVersion implements Producible<ApiVersion> {
 	 * will be deduced based on the {@code Accept} header.
 	 * @param headers the HTTP headers
 	 * @return the API version to use
-	 * @deprecated since 2.5.0 in favor of direct injection with resolution via the
-	 * {@link ProducibleOperationArgumentResolver}.
+	 * @deprecated since 2.5 for removal in 2.7 in favor of direct injection with
+	 * resolution via the {@link ProducibleOperationArgumentResolver}.
 	 */
 	@Deprecated
 	public static ApiVersion fromHttpHeaders(Map<String, List<String>> headers) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java

@@ -172,9 +172,10 @@ public final class WebFluxTags {
 	 * @param exchange the exchange
 	 * @return the outcome tag derived from the response status
 	 * @since 2.1.0
-	 * @deprecated as of 2.5.0 in favor of {@link #outcome(ServerWebExchange, Throwable)},
-	 * to be removed in 2.7.0
+	 * @deprecated since 2.5 for removal in 2.7 in favor of
+	 * {@link #outcome(ServerWebExchange, Throwable)}
 	 */
+	@Deprecated
 	public static Tag outcome(ServerWebExchange exchange) {
 		return outcome(exchange, null);
 	}