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 static MeterValue valueOf(String value) {
 	 * Return a new {@link MeterValue} instance for the given long value.
 	 * @param value the source value
 	 * @return a {@link MeterValue} instance
-	 * @deprecated as of 2.3.0 in favor of {@link #valueOf(double)}
+	 * @deprecated since 2.3 for removal in 2.5 in favor of {@link #valueOf(double)}
 	 */
 	@Deprecated
 	public static MeterValue valueOf(long value) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,8 @@
  *
  * @author Phillip Webb
  * @since 2.0.0
- * @deprecated as of 2.3.0 in favor of {@link ServiceLevelObjectiveBoundary}
+ * @deprecated since 2.3 for removal in 2.5 in favor of
+ * {@link ServiceLevelObjectiveBoundary}
  */
 @Deprecated
 public final class ServiceLevelAgreementBoundary {

spring-boot-project/spring-boot-actuator-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 static class Servlet {
 		 * 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 String getContextPath() {
 		/**
 		 * 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 @@
  * @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 @@
  *
  * @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 @@ private CachedResponse createCachedResponse(Object response, long accessTime) {
 	 * @param timeToLive the maximum time in milliseconds that a response can be cached
 	 * @return a caching version of the invoker or the original instance if caching is not
 	 * required
-	 * @deprecated as of 2.3.0 to make it package-private in 2.4
+	 * @deprecated as of 2.3 to make package-private in 2.4
 	 */
 	@Deprecated
 	public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/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 static Tag status(ClientResponse response, Throwable throwable) {
 	 * {@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 static Tag status(ClientResponse response) {
 	 * 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 @@
  * @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 @@
  *
  * @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 })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java

@@ -40,7 +40,7 @@
  *
  * @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 @@
  *
  * @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 @@
  *
  * @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 @@
  * @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 MongoClientFactory(MongoProperties properties, Environment environment) {
 	 * @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 Gridfs getGridfs() {
 	/**
 	 * 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 @@
  * @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 @@
  * @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 void setViewResolvers(List<ViewResolver> viewResolvers) {
 	 * @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 enum MatchingStrategy {
 
 	/**
 	 * 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 @@ private List<ErrorViewResolver> sortErrorViewResolvers(List<ErrorViewResolver> r
 	 * @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