Merge branch '2.3.x' into 2.4.x

Closes gh-25825

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) {

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 {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.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.
@@ -137,7 +137,7 @@ public class ManagementServerProperties {
 		 * Return the context path with no trailing slash (i.e. the '/' root context is
 		 * represented as the empty string).
 		 * @return the context path (no trailing slash)
-		 * @deprecated since 2.4.0 in favor of
+		 * @deprecated since 2.4 for removal in 2.6 in favor of
 		 * {@link ManagementServerProperties#getBasePath()}
 		 */
 		@Deprecated
@@ -149,7 +149,7 @@ public class ManagementServerProperties {
 		/**
 		 * Set the context path.
 		 * @param contextPath the context path
-		 * @deprecated since 2.4.0 in favor of
+		 * @deprecated since 2.4 for removal in 2.6 in favor of
 		 * {@link ManagementServerProperties#setBasePath(String)}
 		 */
 		@Deprecated

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/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) {

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/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) {

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 {

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
+ * @deprecated since 2.3.3 to be made package-private in 2.5 as this class is not intended
- * package-private in a future release
+ * for public use.
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ Cluster.class, CouchbaseClientFactory.class, CouchbaseCacheManager.class })

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)

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

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientFactory.java

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Vedran Pavic
  * @since 2.0.0
- * @deprecated since 2.3.4 in favor of using the Hazelcast API directly
+ * @deprecated since 2.4.3 for removal in 2.6 in favor of using the Hazelcast API directly
  */
 @Deprecated
 public class HazelcastClientFactory {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastInstanceFactory.java

@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
  * @author Stephane Nicoll
  * @author Phillip Webb
  * @since 1.3.0
- * @deprecated since 2.3.4 in favor of using the Hazelcast API directly
+ * @deprecated since 2.4.3 for removal in 2.6 in favor of using the Hazelcast API directly
  */
 @Deprecated
 public class HazelcastInstanceFactory {

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,8 @@ 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 {@link #MongoClientFactory(List)}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * {@link #MongoClientFactory(List)}
 	 */
 	@Deprecated
 	public MongoClientFactory(MongoProperties properties, Environment environment) {
@@ -55,7 +56,8 @@ public class MongoClientFactory extends MongoClientFactorySupport<MongoClient> {
 	 * @param properties configuration properties
 	 * @param environment a Spring {@link Environment} containing configuration properties
 	 * @param builderCustomizers a list of configuration settings customizers
-	 * @deprecated since 2.4.0 in favor of {@link #MongoClientFactory(List)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #MongoClientFactory(List)}
 	 */
 	@Deprecated
 	public MongoClientFactory(MongoProperties properties, Environment environment,

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.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.
@@ -198,7 +198,7 @@ public class MongoProperties {
 	/**
 	 * Return the GridFS database name.
 	 * @return the GridFS database name
-	 * @deprecated since 2.4.0 in favor of {@link Gridfs#getDatabase()}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link Gridfs#getDatabase()}
 	 */
 	@DeprecatedConfigurationProperty(replacement = "spring.data.mongodb.gridfs.database")
 	@Deprecated

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.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 @@ public class ReactiveMongoClientFactory extends MongoClientFactorySupport<MongoC
 	 * @param properties configuration properties
 	 * @param environment a Spring {@link Environment} containing configuration properties
 	 * @param builderCustomizers a list of configuration settings customizers
-	 * @deprecated since 2.4.0 in favor of {@link #ReactiveMongoClientFactory(List)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #ReactiveMongoClientFactory(List)}
 	 */
 	@Deprecated
 	public ReactiveMongoClientFactory(MongoProperties properties, Environment environment,

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.
@@ -47,7 +47,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)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.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,7 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
  * @author Venil Noronha
  * @author Kristine Jetzke
  * @since 1.1.0
- * @deprecated since 2.4.0 in favor of {@link WebProperties.Resources}
+ * @deprecated since 2.4 for removal in 2.6 in favor of {@link WebProperties.Resources}
  */
 @Deprecated
 @ConfigurationProperties(prefix = "spring.resources", ignoreUnknownFields = false)

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

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.
@@ -97,7 +97,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
 	 * @param errorAttributes the error attributes
 	 * @param resourceProperties the resource properties
 	 * @param applicationContext the application context
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #AbstractErrorWebExceptionHandler(ErrorAttributes, Resources, ApplicationContext)}
 	 */
 	@Deprecated
@@ -157,7 +157,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

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java

@@ -97,7 +97,7 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
 	 * @param resourceProperties the resources configuration properties
 	 * @param errorProperties the error configuration properties
 	 * @param applicationContext the current application context
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #DefaultErrorWebExceptionHandler(ErrorAttributes, Resources, ErrorProperties, ApplicationContext)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java

@@ -553,7 +553,7 @@ public class WebMvcProperties {
 
 	/**
 	 * Locale resolution options.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.autoconfigure.web.WebProperties.LocaleResolver}
 	 */
 	@Deprecated

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

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.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.
@@ -78,7 +78,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
 	 * Create a new {@link DefaultErrorViewResolver} instance.
 	 * @param applicationContext the source application context
 	 * @param resourceProperties resource properties
-	 * @deprecated since 2.4.0 in favour of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #DefaultErrorViewResolver(ApplicationContext, Resources)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/actuate/metrics/AutoConfigureMetricsSpringBootApplication.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-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleReactiveRepository.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-test/src/main/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializer.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.test.context.ContextConfiguration;
  * @author Phillip Webb
  * @since 1.4.0
  * @see org.springframework.boot.context.config.ConfigFileApplicationListener
- * @deprecated since 2.4.0 in favor of {@link ConfigDataApplicationContextInitializer}
+ * @deprecated since 2.4 for removal in 2.6 in favor of
+ * {@link ConfigDataApplicationContextInitializer}
  */
 @Deprecated
 public class ConfigFileApplicationContextInitializer

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.

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.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.
@@ -314,7 +314,8 @@ public final class TestPropertyValues {
 		 * Create a new {@link Pair} instance.
 		 * @param name the name
 		 * @param value the value
-		 * @deprecated since 2.4.0 in favor of {@link #of(String, String)}
+		 * @deprecated since 2.4 for removal in 2.6 in favor of
+		 * {@link #of(String, String)}
 		 */
 		@Deprecated
 		public Pair(String name, String value) {

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.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.
@@ -47,7 +47,7 @@ public interface BuildLog {
 	 * @param request the build request
 	 * @param imageReference the builder image reference
 	 * @return a consumer for progress update events
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #pullingImage(ImageReference, ImageType)}
 	 */
 	@Deprecated
@@ -57,7 +57,8 @@ public interface BuildLog {
 	 * Log that the builder image has been pulled.
 	 * @param request the build request
 	 * @param image the builder image that was pulled
-	 * @deprecated since 2.4.0 in favor of {@link #pulledImage(Image, ImageType)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #pulledImage(Image, ImageType)}
 	 */
 	@Deprecated
 	void pulledBuilder(BuildRequest request, Image image);
@@ -67,7 +68,7 @@ public interface BuildLog {
 	 * @param request the build request
 	 * @param imageReference the run image reference
 	 * @return a consumer for progress update events
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #pullingImage(ImageReference, ImageType)}
 	 */
 	@Deprecated
@@ -77,7 +78,8 @@ public interface BuildLog {
 	 * Log that a run image has been pulled.
 	 * @param request the build request
 	 * @param image the run image that was pulled
-	 * @deprecated since 2.4.0 in favor of {@link #pulledImage(Image, ImageType)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #pulledImage(Image, ImageType)}
 	 */
 	@Deprecated
 	void pulledRunImage(BuildRequest request, Image image);

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.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.
@@ -68,7 +68,7 @@ public class SpringBootExtension {
 	/**
 	 * Returns the fully-qualified main class name of the application.
 	 * @return the fully-qualified name of the application's main class
-	 * @deprecated since 2.4.0 in favor of {@link #getMainClass()}.
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
 	 */
 	@Deprecated
 	@ReplacedBy("mainClass")
@@ -79,7 +79,7 @@ public class SpringBootExtension {
 	/**
 	 * Sets the fully-qualified main class name of the application.
 	 * @param mainClassName the fully-qualified name of the application's main class
-	 * @deprecated since 2.4.0 in favour of {@link #getMainClass} and
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
 	 * {@link Property#set(Object)}
 	 */
 	@Deprecated

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.
@@ -47,7 +47,7 @@ public interface BootArchive extends Task {
 	/**
 	 * Returns the fully-qualified main class name of the application.
 	 * @return the fully-qualified name of the application's main class
-	 * @deprecated since 2.4.0 in favor of {@link #getMainClass()}.
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
 	 */
 	@Deprecated
 	@ReplacedBy("mainClass")
@@ -56,7 +56,7 @@ public interface BootArchive extends Task {
 	/**
 	 * Sets the fully-qualified main class name of the application.
 	 * @param mainClassName the fully-qualified name of the application's main class
-	 * @deprecated since 2.4.0 in favour of {@link #getMainClass} and
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
 	 * {@link Property#set(Object)}
 	 */
 	@Deprecated
@@ -133,8 +133,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
+	 * @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
-	 * development-only dependencies
+	 * does not include development-only dependencies
 	 */
 	@Input
 	@Deprecated
@@ -144,8 +144,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
+	 * @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
-	 * development-only dependencies
+	 * does not include development-only dependencies
 	 */
 	@Deprecated
 	void setExcludeDevtools(boolean excludeDevtools);

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java

@@ -133,7 +133,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
@@ -196,7 +197,7 @@ public class BootJar extends Jar implements BootArchive {
 	/**
 	 * Configures the jar to be layered using the default layering.
 	 * @since 2.3.0
-	 * @deprecated since 2.4.0 as layering as now enabled by default.
+	 * @deprecated since 2.4 for removal in 2.6 as layering as now enabled by default.
 	 */
 	@Deprecated
 	public void layered() {

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);

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

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
+	 * @deprecated since 2.3.10 for removal in 2.5 in favor of {@link #Repackager(File)}
-	 * {@link #setLayoutFactory(LayoutFactory)}
+	 * and {@link #setLayoutFactory(LayoutFactory)}
 	 */
 	@Deprecated
 	public Repackager(File source, LayoutFactory layoutFactory) {

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

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.
 	 */

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")

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.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.
@@ -70,7 +70,7 @@ public class ArtifactsLibraries implements Libraries {
 	 * @param artifacts the artifacts to represent as libraries
 	 * @param unpacks artifacts that should be unpacked on launch
 	 * @param log the log
-	 * @deprecated since 2.4.0 in favour of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #ArtifactsLibraries(Set, Collection, Collection, Log)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/Bootstrapper.java

@@ -24,7 +24,8 @@ package org.springframework.boot;
  * @since 2.4.0
  * @see SpringApplication#addBootstrapper(Bootstrapper)
  * @see BootstrapRegistry
- * @deprecated since 2.4.5 in favor of {@link BootstrapRegistryInitializer}
+ * @deprecated since 2.4.5 for removal in 2.6 in favor of
+ * {@link BootstrapRegistryInitializer}
  */
 @Deprecated
 public interface Bootstrapper {
@@ -41,7 +42,7 @@ public interface Bootstrapper {
 	/**
 	 * Initialize the given {@link BootstrapRegistry} with any required registrations.
 	 * @param registry the registry to initialize
-	 * @deprecated since 2.4.4 in favor of
+	 * @deprecated since 2.4.4 for removal in 2.6 in favor of
 	 * {@link Bootstrapper#initialize(BootstrapRegistry)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -164,7 +164,8 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for non-web
 	 * environments.
-	 * @deprecated since 2.4.0 in favour of using a {@link ApplicationContextFactory}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of using a
+	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
 	public static final String DEFAULT_CONTEXT_CLASS = "org.springframework.context."
@@ -173,7 +174,8 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for web
 	 * environments.
-	 * @deprecated since 2.4.0 in favour of using an {@link ApplicationContextFactory}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of using an
+	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
 	public static final String DEFAULT_SERVLET_WEB_CONTEXT_CLASS = "org.springframework.boot."
@@ -182,7 +184,8 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for reactive web
 	 * environments.
-	 * @deprecated since 2.4.0 in favour of using an {@link ApplicationContextFactory}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of using an
+	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
 	public static final String DEFAULT_REACTIVE_WEB_CONTEXT_CLASS = "org.springframework."
@@ -762,7 +765,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
@@ -1064,7 +1067,7 @@ public class SpringApplication {
 	 * {@link BootstrapRegistry}.
 	 * @param bootstrapper the bootstraper
 	 * @since 2.4.0
-	 * @deprecated since 2.4.5 in favor of
+	 * @deprecated since 2.4.5 for removal in 2.6 in favor of
 	 * {@link #addBootstrapRegistryInitializer(BootstrapRegistryInitializer)}
 	 */
 	@Deprecated
@@ -1218,7 +1221,7 @@ public class SpringApplication {
 	 * applications or {@link AnnotationConfigApplicationContext} for non web based
 	 * applications.
 	 * @param applicationContextClass the context class to set
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #setApplicationContextFactory(ApplicationContextFactory)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.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.
@@ -47,7 +47,8 @@ public interface SpringApplicationRunListener {
 	/**
 	 * Called immediately when the run method has first started. Can be used for very
 	 * early initialization.
-	 * @deprecated since 2.4.0 in favor of {@link #starting(ConfigurableBootstrapContext)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #starting(ConfigurableBootstrapContext)}
 	 */
 	@Deprecated
 	default void starting() {
@@ -68,7 +69,7 @@ public interface SpringApplicationRunListener {
 	 * Called once the environment has been prepared, but before the
 	 * {@link ApplicationContext} has been created.
 	 * @param environment the environment
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #environmentPrepared(ConfigurableBootstrapContext, ConfigurableEnvironment)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java

@@ -276,7 +276,7 @@ public class SpringApplicationBuilder {
 	 * Explicitly set the context class to be used.
 	 * @param cls the context class to use
 	 * @return the current builder
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #contextFactory(ApplicationContextFactory)}
 	 */
 	@Deprecated
@@ -405,7 +405,7 @@ public class SpringApplicationBuilder {
 	 * @param bootstrapper the bootstraper
 	 * @return the current builder
 	 * @since 2.4.0
-	 * @deprecated since 2.4.5 in favor of
+	 * @deprecated since 2.4.5 for removal in 2.6 in favor of
 	 * {@link #addBootstrapRegistryInitializer(BootstrapRegistryInitializer)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.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.
@@ -107,7 +107,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor
 
 	/**
 	 * Create a new {@link CloudFoundryVcapEnvironmentPostProcessor} instance.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #CloudFoundryVcapEnvironmentPostProcessor(Log)}
 	 */
 	@Deprecated
@@ -154,8 +154,8 @@ public class CloudFoundryVcapEnvironmentPostProcessor
 
 	/**
 	 * Event listener used to switch logging.
-	 * @deprecated since 2.4.0 in favor of only using {@link EnvironmentPostProcessor}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of only using
-	 * callbacks
+	 * {@link EnvironmentPostProcessor} callbacks
 	 */
 	@Deprecated
 	@Override

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.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.
@@ -112,7 +112,8 @@ import org.springframework.util.StringUtils;
  * @author Madhura Bhave
  * @author Scott Frederick
  * @since 1.0.0
- * @deprecated since 2.4.0 in favor of {@link ConfigDataEnvironmentPostProcessor}
+ * @deprecated since 2.4 for removal in 2.6 in favor of
+ * {@link ConfigDataEnvironmentPostProcessor}
  */
 @Deprecated
 public class ConfigFileApplicationListener implements EnvironmentPostProcessor, SmartApplicationListener, Ordered {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.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.core.env.PropertySource;
  * {@link ConfigFileApplicationListener} to filter out properties for specific operations.
  *
  * @author Phillip Webb
- * @deprecated since 2.4.0 along with {@link ConfigFileApplicationListener}
+ * @deprecated since 2.4 for removal in 2.6 along with
+ * {@link ConfigFileApplicationListener}
  */
 @Deprecated
 class FilteredPropertySource extends PropertySource<PropertySource<?>> {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.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,7 +40,7 @@ public class ApplicationEnvironmentPreparedEvent extends SpringApplicationEvent
 	 * @param application the current application
 	 * @param args the arguments the application is running with
 	 * @param environment the environment that was just created
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #ApplicationEnvironmentPreparedEvent(ConfigurableBootstrapContext, SpringApplication, String[], ConfigurableEnvironment)}
 	 */
 	@Deprecated

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.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 class ApplicationStartingEvent extends SpringApplicationEvent {
 	 * Create a new {@link ApplicationStartingEvent} instance.
 	 * @param application the current application
 	 * @param args the arguments the application is running with
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #ApplicationStartingEvent(ConfigurableBootstrapContext, SpringApplication, String[])}
 	 */
 	@Deprecated

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.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,8 +38,9 @@ import org.springframework.core.ResolvableType;
  *
  * @author Andy Wilkinson
  * @since 2.0.0
- * @deprecated since 2.4.0 with no direct replacement. {@link FailureAnalysis} is now the
+ * @deprecated since 2.4 for removal in 2.6 with no direct replacement.
- * preferred approach for diagnosing and reporting startup failures.
+ * {@link FailureAnalysis} is now the preferred approach for diagnosing and reporting
+ * startup failures.
  */
 @Deprecated
 public final class ClasspathLoggingApplicationListener implements GenericApplicationListener {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.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 enum EmbeddedDatabaseConnection {
 
 	/**
 	 * HSQL Database Connection.
-	 * @deprecated since 2.4.0 in favor of {@link EmbeddedDatabaseConnection#HSQLDB}.
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link EmbeddedDatabaseConnection#HSQLDB}.
 	 */
 	@Deprecated
 	HSQL(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "org.hsqldb.jdbcDriver",
@@ -140,7 +141,8 @@ public enum EmbeddedDatabaseConnection {
 	 * database type.
 	 * @param driverClass the driver class
 	 * @return true if the driver class is one of the embedded types
-	 * @deprecated since 2.4.0 in favor of {@link #isEmbedded(String, String)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #isEmbedded(String, String)}
 	 */
 	@Deprecated
 	public static boolean isEmbedded(String driverClass) {

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 {

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 {

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 {

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")

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")

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;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java

@@ -83,7 +83,7 @@ public class LoggingSystemProperties {
 	/**
 	 * The name of the System property that contains the rolled-over log file name
 	 * pattern.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_FILE_NAME_PATTERN}
 	 */
 	@Deprecated
@@ -91,7 +91,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the clean history on start flag.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_CLEAN_HISTORY_ON_START}
 	 */
 	@Deprecated
@@ -99,7 +99,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the file log max size.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_FILE_SIZE}
 	 */
 	@Deprecated
@@ -107,7 +107,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the file total size cap.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_TOTAL_SIZE_CAP}
 	 */
 	@Deprecated
@@ -115,7 +115,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the file log max history.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_HISTORY}
 	 */
 	@Deprecated

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.

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

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.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.
@@ -250,7 +250,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
 	 * Return if filters should be initialized eagerly.
 	 * @return {@code true} if filters are initialized eagerly, otherwise {@code false}.
 	 * @since 2.0.0
-	 * @deprecated since 2.4.0 in favor of {@link #isEagerFilterInit()}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
 	 */
 	@Deprecated
 	public boolean isEagerInitFilters() {
@@ -262,7 +262,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
 	 * @param eagerInitFilters {@code true} if filters are initialized eagerly, otherwise
 	 * {@code false}.
 	 * @since 2.0.0
-	 * @deprecated since 2.4.0 in favor of {@link #isEagerFilterInit()}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
 	 */
 	@Deprecated
 	public void setEagerInitFilters(boolean eagerInitFilters) {

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

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

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

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.
@@ -82,7 +82,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

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

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();