Update deprecations with for removal targets

Update all deprecation tags to include a removal target. Closes gh-25808
4 years ago · 26dd1b9a26
parent 896f20e1d3
commit 26dd1b9a26
57 changed files with 150 additions and 124 deletions
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java
+++ b/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 @@ import org.springframework.core.env.Environment;
 * @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<?>>
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java
+++ b/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 @@ import org.springframework.core.ResolvableType;
 * @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> {
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java
+++ b/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 @@ import org.springframework.core.ResolvableType;
 * @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
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java
+++ b/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 @@ import org.springframework.context.annotation.Configuration;
 * @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)
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.java
+++ b/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 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
 *
 * @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")
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java
+++ b/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 final class MeterValue {
 	 * 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) {
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java
+++ b/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 @@ import io.micrometer.core.instrument.Meter;
 *
 * @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 {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java
+++ b/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 @@ public class CachingOperationInvoker implements OperationInvoker {
 	 * @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) {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
+++ b/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 @@ import java.util.stream.Collectors;
 * @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 {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java
+++ b/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 @@ import java.util.Map;
 * @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 {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.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 @@ import reactor.util.function.Tuple2;
 *
 * @author Stephane Nicoll
 * @since 2.0.0
- * @deprecated since 2.2.0 in favor of a {@link CompositeReactiveHealthContributor}
+ * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * {@link CompositeReactiveHealthContributor}
 */
@Deprecated
 public class CompositeReactiveHealthIndicator implements ReactiveHealthIndicator {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.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,7 @@ import org.springframework.util.Assert;
 * @author Vedran Pavic
 * @author Stephane Nicoll
 * @since 2.1.0
- * @deprecated since 2.2.0 in favor of {@link DefaultContributorRegistry}
+ * @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry}
 */
@Deprecated
 public class DefaultHealthIndicatorRegistry implements HealthIndicatorRegistry {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.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,7 @@ import org.springframework.util.Assert;
 * @author Vedran Pavic
 * @author Stephane Nicoll
 * @since 2.1.0
- * @deprecated since 2.2.0 in favor of {@link DefaultContributorRegistry}
+ * @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry}
 */
@Deprecated
 public class DefaultReactiveHealthIndicatorRegistry implements ReactiveHealthIndicatorRegistry {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.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,7 @@ import java.util.Map;
 *
 * @author Christian Dupuis
 * @since 1.1.0
- * @deprecated since 2.2.0 in favor of {@link StatusAggregator}
+ * @deprecated since 2.2 for removal in 2.4 in favor of {@link StatusAggregator}
 */
@FunctionalInterface
@Deprecated
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.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.
@ -22,7 +22,8 @@ package org.springframework.boot.actuate.health;
 * @author Stephane Nicoll
 * @author Phillip Webb
 * @since 2.0.0
- * @deprecated since 2.2.0 in favor of {@link HealthContributorNameFactory}
+ * @deprecated since 2.2 for removal in 2.4 in favor of
+ * {@link HealthContributorNameFactory}
 */
@Deprecated
 public class HealthIndicatorNameFactory extends HealthContributorNameFactory {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java
+++ b/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.
@ -27,7 +27,7 @@ import org.springframework.util.Assert;
 *
 * @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 ReactiveHealthContributor#adapt(HealthContributor)}
 * @see ReactiveHealthContributor#adapt(HealthContributor)
 */
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.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 @@ import java.util.Map;
 * @author Stephane Nicoll
 * @since 2.1.0
 * @see HealthEndpoint
- * @deprecated since 2.2.0 in favor of a {@link HealthContributorRegistry}
+ * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * {@link HealthContributorRegistry}
 */
@Deprecated
 public interface HealthIndicatorRegistry {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.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 @@ import org.springframework.util.Assert;
 *
 * @author Stephane Nicoll
 * @since 2.1.0
- * @deprecated since 2.2.0 in favor of {@link DefaultHealthIndicatorRegistry}
+ * @deprecated since 2.2 for removal in 2.4 in favor of
+ * {@link DefaultHealthIndicatorRegistry}
 */
@Deprecated
 public class HealthIndicatorRegistryFactory {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.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,7 @@ import org.springframework.util.Assert;
 *
 * @author Christian Dupuis
 * @since 1.1.0
- * @deprecated since 2.2.0 in favor of {@link SimpleStatusAggregator}
+ * @deprecated since 2.2 for removal in 2.4 in favor of {@link SimpleStatusAggregator}
 */
@Deprecated
 public class OrderedHealthAggregator extends AbstractHealthAggregator {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.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 @@ import java.util.Map;
 * @author Stephane Nicoll
 * @since 2.1.0
 * @see HealthIndicatorRegistry
- * @deprecated since 2.2.0 in favor of a {@link ReactiveHealthContributorRegistry}
+ * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * {@link ReactiveHealthContributorRegistry}
 */
@Deprecated
 public interface ReactiveHealthIndicatorRegistry {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.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 @@ import org.springframework.util.ObjectUtils;
 *
 * @author Stephane Nicoll
 * @since 2.1.0
- * @deprecated since 2.2.0 in favor of {@link DefaultReactiveHealthIndicatorRegistry}
+ * @deprecated since 2.2 for removal in 2.4 in favor of
+ * {@link DefaultReactiveHealthIndicatorRegistry}
 */
@Deprecated
 public class ReactiveHealthIndicatorRegistryFactory {
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.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.
@ -99,7 +99,8 @@ public final class WebClientExchangeTags {
 	 * {@link ClientResponse#statusCode()} of the given {@code response}.
 	 * @param response the response
 	 * @return the status tag
-	 * @deprecated since 2.3.0 in favor of {@link #status(ClientResponse, Throwable)}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * {@link #status(ClientResponse, Throwable)}
 	 */
 	@Deprecated
 	public static Tag status(ClientResponse response) {
@ -111,7 +112,8 @@ public final class WebClientExchangeTags {
 	 * client.
 	 * @param throwable the exception
 	 * @return the status tag
-	 * @deprecated since 2.3.0 in favor of {@link #status(ClientResponse, Throwable)}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * {@link #status(ClientResponse, Throwable)}
 	 */
 	@Deprecated
 	public static Tag status(Throwable throwable) {
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.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 @@ import org.springframework.boot.ApplicationRunner;
 * @author Jean-Pierre Bergamin
 * @author Mahmoud Ben Hassine
 * @since 1.0.0
- * @deprecated since 2.3.0 in favor of {@link JobLauncherApplicationRunner}
+ * @deprecated since 2.3 for removal in 2.5 in favor of
+ * {@link JobLauncherApplicationRunner}
 */
@Deprecated
 public class JobLauncherCommandLineRunner extends JobLauncherApplicationRunner {
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.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.
@ -40,8 +40,8 @@ import org.springframework.util.ObjectUtils;
 *
 * @author Stephane Nicoll
 * @since 1.4.0
- * @deprecated since 2.3.3 as this class is not intended for public use. It will be made
- * package-private in a future release
+ * @deprecated since 2.3.3 to be made package-private in 2.5 as this class is not intended
+ * for public use.
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ Cluster.class, CouchbaseClientFactory.class, CouchbaseCacheManager.class })
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java
@ -40,7 +40,7 @@ import org.springframework.data.solr.repository.support.SolrRepositoryFactoryBea
 *
 * @author Christoph Strobl
 * @author Oliver Gierke
- * @deprecated since 2.3.9 as Spring Data Solr is deprecated
+ * @deprecated since 2.3.9 for removal in 2.5 as Spring Data Solr is deprecated
 * @since 1.1.0
 */
@Configuration(proxyBeanMethods = false)
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.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.
@ -25,7 +25,7 @@ import org.elasticsearch.client.RestClientBuilder;
 *
 * @author Brian Clozel
 * @since 2.1.0
- * @deprecated as of 2.3.1 in favor of
+ * @deprecated as of 2.3.1 for removal in 2.5 in favor of
 * {@link org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCustomizer}
 */
@FunctionalInterface
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.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.
@ -43,7 +43,7 @@ public class MongoClientFactory extends MongoClientFactorySupport<MongoClient> {
 	 * Construct a factory for creating a blocking {@link MongoClient}.
 	 * @param properties configuration properties
 	 * @param environment a Spring {@link Environment} containing configuration properties
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #MongoClientFactory(MongoProperties, Environment, List)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.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.
@ -51,7 +51,8 @@ import org.springframework.util.StringUtils;
 * @author Phillip Webb
 * @author Andy Wilkinson
 * @author Kazuki Shimizu
- * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained
+ * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * maintained
 */
@Deprecated
@Configuration(proxyBeanMethods = false)
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.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.
@ -50,7 +50,7 @@ public class WebConversionService extends DefaultFormattingConversionService {
 	 * Create a new WebConversionService that configures formatters with the provided date
 	 * format, or register the default ones if no custom format is provided.
 	 * @param dateFormat the custom date format to use for date conversions
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #WebConversionService(DateTimeFormatters)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.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.
@ -135,7 +135,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
 	 * @param request the source request
 	 * @param includeStackTrace whether to include the error stacktrace information
 	 * @return the error attributes as a Map
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.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.
@ -75,7 +75,7 @@ public abstract class AbstractErrorController implements ErrorController {
 	 * @param request the source request
 	 * @param includeStackTrace if stack trace elements should be included
 	 * @return the error attributes
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #getErrorAttributes(HttpServletRequest, ErrorAttributeOptions)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.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.
@ -143,7 +143,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
 	 * empty array.
 	 * @param config the source context configuration
 	 * @return the application arguments to use
-	 * @deprecated since 2.2.7
+	 * @deprecated since 2.2.7 for removal in 2.4
 	 * @see SpringApplication#run(String...)
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.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.
@ -118,8 +118,8 @@ public interface BootArchive extends Task {
 	 * {@code false}.
 	 * @return {@code true} if the Devtools jar should be excluded, or {@code false} if
 	 * not
-	 * @deprecated since 2.3.0 in favour of configuring a classpath that does not include
-	 * development-only dependencies
+	 * @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
+	 * does not include development-only dependencies
 	 */
 	@Input
 	@Deprecated
@ -129,8 +129,8 @@ public interface BootArchive extends Task {
 	 * Sets whether or not the Devtools jar should be excluded.
 	 * @param excludeDevtools {@code true} if the Devtools jar should be excluded, or
 	 * {@code false} if not
-	 * @deprecated since 2.3.0 in favour of configuring a classpath that does not include
-	 * development-only dependencies
+	 * @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
+	 * does not include development-only dependencies
 	 */
 	@Deprecated
 	void setExcludeDevtools(boolean excludeDevtools);
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.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.
@ -122,7 +122,8 @@ public class BootJar extends Jar implements BootArchive {
 	 * Returns the {@link Configuration Configurations} of the project associated with
 	 * this task.
 	 * @return the configurations
-	 * @deprecated since 2.3.5 in favor of {@link Project#getConfigurations}
+	 * @deprecated since 2.3.5 for removal in 2.5 in favor of
+	 * {@link Project#getConfigurations}
 	 */
 	@Internal
 	@Deprecated
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.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.
@ -52,7 +52,7 @@ public interface Layout {
 	 * @param scope the scope of the library
 	 * @return the destination relative to the root of the archive (should end with '/')
 	 * or {@code null} if the library should not be included.
-	 * @deprecated since 2.3.0 in favor of {@link #getLibraryLocation}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of {@link #getLibraryLocation}
 	 */
 	@Deprecated
 	String getLibraryDestination(String libraryName, LibraryScope scope);
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java
@ -100,7 +100,7 @@ public abstract class Packager {
 	 * Create a new {@link Packager} instance.
 	 * @param source the source archive file to package
 	 * @param layoutFactory the layout factory to use or {@code null}
-	 * @deprecated since 2.5.0 in favor of {@link #Packager(File)} and
+	 * @deprecated since 2.3.10 for removal in 2.5 in favor of {@link #Packager(File)} and
 	 * {@link #setLayoutFactory(LayoutFactory)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
@ -51,8 +51,8 @@ public class Repackager extends Packager {
 	 * Create a new {@link Repackager} instance.
 	 * @param source the source archive file to package
 	 * @param layoutFactory the layout factory to use or {@code null}
-	 * @deprecated since 2.5.0 in favor of {@link #Repackager(File)} and
-	 * {@link #setLayoutFactory(LayoutFactory)}
+	 * @deprecated since 2.3.10 for removal in 2.5 in favor of {@link #Repackager(File)}
+	 * and {@link #setLayoutFactory(LayoutFactory)}
 	 */
 	@Deprecated
 	public Repackager(File source, LayoutFactory layoutFactory) {
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.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.
@ -63,7 +63,8 @@ public abstract class Launcher {
 	 * @param archives the archives
 	 * @return the classloader
 	 * @throws Exception if the classloader cannot be created
-	 * @deprecated since 2.3.0 in favor of {@link #createClassLoader(Iterator)}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * {@link #createClassLoader(Iterator)}
 	 */
 	@Deprecated
 	protected ClassLoader createClassLoader(List<Archive> archives) throws Exception {
@ -139,7 +140,7 @@ public abstract class Launcher {
 	 * Returns the archives that will be used to construct the class path.
 	 * @return the class path archives
 	 * @throws Exception if the class path archives cannot be obtained
-	 * @deprecated since 2.3.0 in favor of implementing
+	 * @deprecated since 2.3 for removal in 2.5 in favor of implementing
 	 * {@link #getClassPathArchivesIterator()}.
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.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.
@ -75,7 +75,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	 * @param filter the filter used to limit entries
 	 * @return nested archives
 	 * @throws IOException if nested archives cannot be read
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #getNestedArchives(EntryFilter, EntryFilter)}
 	 */
 	@Deprecated
@ -86,7 +86,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	/**
 	 * Return a new iterator for the archive entries.
 	 * @see java.lang.Iterable#iterator()
-	 * @deprecated since 2.3.0 in favor of using
+	 * @deprecated since 2.3 for removal in 2.5 in favor of using
 	 * {@link org.springframework.boot.loader.jar.JarFile} to access entries and
 	 * {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
 	 */
@ -98,7 +98,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	 * Performs the given action for each element of the {@code Iterable} until all
 	 * elements have been processed or the action throws an exception.
 	 * @see Iterable#forEach
-	 * @deprecated since 2.3.0 in favor of using
+	 * @deprecated since 2.3 for removal in 2.5 in favor of using
 	 * {@link org.springframework.boot.loader.jar.JarFile} to access entries and
 	 * {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
 	 */
@ -114,7 +114,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	/**
 	 * Creates a {@link Spliterator} over the elements described by this {@code Iterable}.
 	 * @see Iterable#spliterator
-	 * @deprecated since 2.3.0 in favor of using
+	 * @deprecated since 2.3 for removal in 2.5 in favor of using
 	 * {@link org.springframework.boot.loader.jar.JarFile} to access entries and
 	 * {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
 	 */
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.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.
@ -179,7 +179,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 	 * Additional directories besides the classes directory that should be added to the
 	 * classpath.
 	 * @since 1.0.0
-	 * @deprecated since 2.3.0 in favor of {@code directories}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of {@code directories}
 	 */
 	@Deprecated
 	@Parameter(property = "spring-boot.run.folders")
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@ -738,7 +738,7 @@ public class SpringApplication {
 	/**
 	 * Refresh the underlying {@link ApplicationContext}.
 	 * @param applicationContext the application context to refresh
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #refresh(ConfigurableApplicationContext)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.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.
@ -38,7 +38,8 @@ import org.springframework.core.annotation.AnnotationUtils;
 *
 * @author Dave Syer
 * @since 1.1.0
- * @deprecated since 2.2.0 in favor of {@link ConfigurationPropertiesBean}
+ * @deprecated since 2.2 for removal in 2.4 in favor of
+ * {@link ConfigurationPropertiesBean}
 */
@Deprecated
 public class ConfigurationBeanFactoryMetadata implements ApplicationContextAware {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.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.core.Ordered;
 *
 * @author Phillip Webb
 * @since 1.2.0
- * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained
+ * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * maintained
 */
@Deprecated
 public class BitronixDependentBeanFactoryPostProcessor implements BeanFactoryPostProcessor, Ordered {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.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 @@ import org.springframework.boot.jms.XAConnectionFactoryWrapper;
 *
 * @author Phillip Webb
 * @since 1.2.0
- * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained
+ * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * maintained
 */
@Deprecated
 public class BitronixXAConnectionFactoryWrapper implements XAConnectionFactoryWrapper {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.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 @@ import org.springframework.boot.jdbc.XADataSourceWrapper;
 *
 * @author Phillip Webb
 * @since 1.2.0
- * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained
+ * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * maintained
 */
@Deprecated
 public class BitronixXADataSourceWrapper implements XADataSourceWrapper {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.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.
@ -41,7 +41,8 @@ import org.springframework.util.StringUtils;
 * @author Josh Long
 * @author Andy Wilkinson
 * @since 1.2.0
- * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained
+ * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * maintained
 */
@Deprecated
@SuppressWarnings("serial")
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.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.
@ -42,7 +42,8 @@ import org.springframework.util.StringUtils;
 * @author Josh Long
 * @author Andy Wilkinson
 * @since 1.2.0
- * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained
+ * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * maintained
 */
@Deprecated
@SuppressWarnings("serial")
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.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.
@ -16,6 +16,7 @@

 /**
 * Support classes for Bitronix JTA.
- * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained
+ * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * maintained
 */
 package org.springframework.boot.jta.bitronix;
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.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.
@ -94,8 +94,8 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur
 	 * {@link ServerRSocketFactory} while building the server. Calling this method will
 	 * replace any existing processors.
 	 * @param socketFactoryProcessors processors to apply before the server starts
-	 * @deprecated in favor of {@link #setRSocketServerCustomizers(Collection)} as of
-	 * 2.2.7
+	 * @deprecated since 2.2.7 for removal in 2.4 in favor of
+	 * {@link #setRSocketServerCustomizers(Collection)}
 	 */
 	@Deprecated
 	public void setSocketFactoryProcessors(
@ -108,8 +108,8 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur
 	 * Add {@link ServerRSocketFactoryProcessor}s that should be called to process the
 	 * {@link ServerRSocketFactory} while building the server.
 	 * @param socketFactoryProcessors processors to apply before the server starts
-	 * @deprecated in favor of
-	 * {@link #addRSocketServerCustomizers(RSocketServerCustomizer...)} as of 2.2.7
+	 * @deprecated since 2.2.7 for removal in 2.4 in favor of
+	 * {@link #addRSocketServerCustomizers(RSocketServerCustomizer...)}
 	 */
 	@Deprecated
 	public void addSocketFactoryProcessors(ServerRSocketFactoryProcessor... socketFactoryProcessors) {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ServerRSocketFactoryProcessor.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ServerRSocketFactoryProcessor.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.
@ -25,7 +25,7 @@ import io.rsocket.RSocketFactory.ServerRSocketFactory;
 * @author Brian Clozel
 * @see RSocketServerFactory
 * @since 2.2.0
- * @deprecated in favor of {@link RSocketServerCustomizer} as of 2.2.7
+ * @deprecated since 2.2.7 for removal in 2.4 in favor of {@link RSocketServerCustomizer}
 */
@FunctionalInterface
@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.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.
@ -51,7 +51,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
 	 * @param contextPath the root context path
 	 * @param autoStart if the server should be started
 	 * @param compression compression configuration
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
 	 */
 	@Deprecated
@ -68,7 +68,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
 	 * @param useForwardHeaders if x-forward headers should be used
 	 * @param autoStart if the server should be started
 	 * @param compression compression configuration
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
 	 */
 	@Deprecated
@ -86,7 +86,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
 	 * @param autoStart if the server should be started
 	 * @param compression compression configuration
 	 * @param serverHeader string to be used in HTTP header
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java
@ -92,7 +92,7 @@ public class UndertowWebServer implements WebServer {
 	 * @param autoStart if the server should be started
 	 * @param closeable called when the server is stopped
 	 * @since 2.0.4
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #UndertowWebServer(io.undertow.Undertow.Builder, Iterable, boolean)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.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.
@ -75,7 +75,7 @@ public class DefaultErrorAttributes implements ErrorAttributes {
 	/**
 	 * Create a new {@link DefaultErrorAttributes} instance.
 	 * @param includeException whether to include the "exception" attribute
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link ErrorAttributeOptions#including(Include...)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.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.
@ -41,7 +41,7 @@ public interface ErrorAttributes {
 	 * @param request the source request
 	 * @param includeStackTrace if stack trace attribute should be included
 	 * @return a map of error attributes
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.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.
@ -81,7 +81,7 @@ public class DefaultErrorAttributes implements ErrorAttributes, HandlerException
 	/**
 	 * Create a new {@link DefaultErrorAttributes} instance.
 	 * @param includeException whether to include the "exception" attribute
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link ErrorAttributeOptions#including(Include...)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.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.
@ -42,7 +42,7 @@ public interface ErrorAttributes {
 	 * @param webRequest the source request
 	 * @param includeStackTrace if stack trace element should be included
 	 * @return a map of error attributes
-	 * @deprecated since 2.3.0 in favor of
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
 	 * {@link #getErrorAttributes(WebRequest, ErrorAttributeOptions)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.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,8 @@ public interface ErrorController {
 	 * The return value from this method is not used; the property `server.error.path`
 	 * must be set to override the default error page path.
 	 * @return the error path
-	 * @deprecated since 2.3.0 in favor of setting the property `server.error.path`
+	 * @deprecated since 2.3 for removal in 2.5 in favor of setting the property
+	 * `server.error.path`
 	 */
 	@Deprecated
 	String getErrorPath();