Update deprecations with for removal targets

Update all deprecation tags to include a removal target.

Closes gh-25808

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.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.
@@ -30,7 +30,8 @@
  * @param <E> the endpoint type
  * @author Phillip Webb
  * @since 2.0.0
- * @deprecated since 2.2.7 in favor of {@link IncludeExcludeEndpointFilter}
+ * @deprecated since 2.2.7 for removal in 2.4 in favor of
+ * {@link IncludeExcludeEndpointFilter}
  */
 @Deprecated
 public class ExposeExcludePropertyEndpointFilter<E extends ExposableEndpoint<?>>

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.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.
@@ -34,7 +34,8 @@
  * @param <S> the bean source type
  * @author Stephane Nicoll
  * @since 2.0.0
- * @deprecated since 2.2.0 in favor of {@link CompositeHealthContributorConfiguration}
+ * @deprecated since 2.2 for removal in 2.4 in favor of
+ * {@link CompositeHealthContributorConfiguration}
  */
 @Deprecated
 public abstract class CompositeHealthIndicatorConfiguration<H extends HealthIndicator, S> {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.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.
@@ -33,7 +33,7 @@
  * @param <S> the bean source type
  * @author Stephane Nicoll
  * @since 2.0.0
- * @deprecated since 2.2.0 in favor of
+ * @deprecated since 2.2 for removal in 2.4 in favor of
  * {@link CompositeReactiveHealthContributorConfiguration}
  */
 @Deprecated

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.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.
@@ -29,7 +29,8 @@
  * @author Phillip Webb
  * @author Vedran Pavic
  * @since 2.0.0
- * @deprecated since 2.2.0 in favor of {@link HealthContributorAutoConfiguration}
+ * @deprecated since 2.2 for removal in 2.4 in favor of
+ * {@link HealthContributorAutoConfiguration}
  */
 @Deprecated
 @Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.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.
@@ -29,7 +29,7 @@
  *
  * @author Christian Dupuis
  * @since 2.0.0
- * @deprecated since 2.2.0 in favor of {@link HealthEndpointProperties}
+ * @deprecated since 2.2 for removal in 2.4 in favor of {@link HealthEndpointProperties}
  */
 @Deprecated
 @ConfigurationProperties(prefix = "management.health.status")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.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.
@@ -97,7 +97,7 @@ public static MeterValue valueOf(String value) {
 	 * Return a new {@link MeterValue} instance for the given long value.
 	 * @param value the source value
 	 * @return a {@link MeterValue} instance
-	 * @deprecated as of 2.3.0 in favor of {@link #valueOf(double)}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of {@link #valueOf(double)}
 	 */
 	@Deprecated
 	public static MeterValue valueOf(long value) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.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.
@@ -27,7 +27,8 @@
  *
  * @author Phillip Webb
  * @since 2.0.0
- * @deprecated as of 2.3.0 in favor of {@link ServiceLevelObjectiveBoundary}
+ * @deprecated since 2.3 for removal in 2.5 in favor of
+ * {@link ServiceLevelObjectiveBoundary}
  */
 @Deprecated
 public final class ServiceLevelAgreementBoundary {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.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.
@@ -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.0 to make it package-private in 2.4
+	 * @deprecated as of 2.3 to make package-private in 2.4
 	 */
 	@Deprecated
 	public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.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.
@@ -28,7 +28,8 @@
  * @author Christian Dupuis
  * @author Vedran Pavic
  * @since 1.1.0
- * @deprecated since 2.2.0 as {@link HealthAggregator} has been deprecated
+ * @deprecated since 2.2 for removal in 2.4 as {@link HealthAggregator} has been
+ * deprecated
  */
 @Deprecated
 public abstract class AbstractHealthAggregator implements HealthAggregator {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.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.
@@ -26,7 +26,8 @@
  * @author Phillip Webb
  * @author Christian Dupuis
  * @since 1.1.0
- * @deprecated since 2.2.0 in favor of a {@link CompositeHealthContributor}
+ * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * {@link CompositeHealthContributor}
  */
 @Deprecated
 public class CompositeHealthIndicator implements HealthIndicator {