From cbf42dea1497a4f20aa02578601fbfddc5e214ad Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 26 May 2022 13:59:03 +0100
Subject: [PATCH] Update deprecation messages to change removal version from
 2.8 to 3.0

Closes gh-30903
---
 .../actuate/autoconfigure/OnEndpointElementCondition.java | 4 ++--
 .../endpoint/expose/IncludeExcludeEndpointFilter.java     | 8 ++++----
 .../properties/ConfigurationPropertiesReportEndpoint.java | 2 +-
 .../boot/actuate/env/EnvironmentEndpoint.java             | 4 ++--
 .../AbstractRabbitListenerContainerFactoryConfigurer.java | 6 +++---
 .../DirectRabbitListenerContainerFactoryConfigurer.java   | 4 ++--
 .../boot/autoconfigure/amqp/RabbitTemplateConfigurer.java | 6 +++---
 .../SimpleRabbitListenerContainerFactoryConfigurer.java   | 4 ++--
 .../autoconfigure/batch/BatchDataSourceInitializer.java   | 4 ++--
 ...precatedReactiveElasticsearchRestClientProperties.java | 4 ++--
 .../DeprecatedElasticsearchRestClientProperties.java      | 4 ++--
 .../integration/IntegrationDataSourceInitializer.java     | 4 ++--
 .../autoconfigure/quartz/QuartzDataSourceInitializer.java | 4 ++--
 .../session/JdbcSessionDataSourceInitializer.java         | 4 ++--
 .../autoconfigure/web/reactive/WebFluxProperties.java     | 8 ++++----
 .../boot/cli/compiler/grape/AetherGrapeEngine.java        | 2 +-
 .../boot/cli/compiler/grape/AetherGrapeEngineFactory.java | 2 +-
 .../context/runner/AbstractApplicationContextRunner.java  | 6 +++---
 .../gradle/tasks/application/CreateBootStartScripts.java  | 2 +-
 .../boot/SpringApplicationRunListener.java                | 6 +++---
 .../boot/builder/SpringApplicationBuilder.java            | 4 ++--
 .../boot/context/event/ApplicationReadyEvent.java         | 4 ++--
 .../boot/context/event/ApplicationStartedEvent.java       | 4 ++--
 .../boot/jdbc/AbstractDataSourceInitializer.java          | 4 ++--
 .../boot/jdbc/DataSourceInitializationMode.java           | 4 ++--
 .../boot/logging/log4j2/Log4J2LoggingSystem.java          | 4 ++--
 .../orm/jpa/hibernate/SpringPhysicalNamingStrategy.java   | 4 ++--
 27 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java
index a9b9a3f7dd..ff0cb0e655 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -85,7 +85,7 @@ public abstract class OnEndpointElementCondition extends SpringBootCondition {
 	 * Return the default outcome that should be used.
 	 * @param context the condition context
 	 * @return the default outcome
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #getDefaultOutcome(ConditionContext, AnnotationAttributes)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java
index fa55c55b2b..fe92d83571 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -58,7 +58,7 @@ public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implem
 	 * @param environment the environment containing the properties
 	 * @param prefix the property prefix to bind
 	 * @param defaultIncludes the default {@code includes} to use when none are specified.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #IncludeExcludeEndpointFilter(Class, Environment, String, String[])}
 	 */
 	@Deprecated
@@ -103,7 +103,7 @@ public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implem
 	 * @param include the include patterns
 	 * @param exclude the exclude patterns
 	 * @param defaultIncludes the default {@code includes} to use when none are specified.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #IncludeExcludeEndpointFilter(Class, Environment, String, String[])}
 	 */
 	@Deprecated
@@ -174,7 +174,7 @@ public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implem
 
 	/**
 	 * Default include patterns that can be used.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of {@link EndpointExposure}.
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of {@link EndpointExposure}.
 	 */
 	@Deprecated
 	public enum DefaultIncludes {
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
index bff7fc6d4f..f1545096eb 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
@@ -169,7 +169,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
 	 * {@link ConfigurationProperties @ConfigurationProperties} objects into a {@link Map}
 	 * structure.
 	 * @param mapper the object mapper
-	 * @deprecated since 2.6 for removal in 2.8 in favor of
+	 * @deprecated since 2.6 for removal in 3.0 in favor of
 	 * {@link #configureJsonMapper(com.fasterxml.jackson.databind.json.JsonMapper.Builder)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java
index 79644791c2..a261deeda4 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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 EnvironmentEndpoint {
 	 * @param key the name to sanitize
 	 * @param value the value to sanitize
 	 * @return the sanitized value
-	 * @deprecated since 2.6.0 for removal in 2.8.0 as sanitization should be internal to
+	 * @deprecated since 2.6.0 for removal in 3.0.0 as sanitization should be internal to
 	 * the class
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
index 9877d08b95..cf4ecb2fbe 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -49,7 +49,7 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
 
 	/**
 	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #AbstractRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
 	 */
 	@Deprecated
@@ -94,7 +94,7 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
 	/**
 	 * Set the {@link RabbitProperties} to use.
 	 * @param rabbitProperties the {@link RabbitProperties}
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #AbstractRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java
index 1789511d06..0140694132 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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 @@ public final class DirectRabbitListenerContainerFactoryConfigurer
 
 	/**
 	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #DirectRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java
index f775b5d021..08d47f5dd1 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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 class RabbitTemplateConfigurer {
 
 	/**
 	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #RabbitTemplateConfigurer(RabbitProperties)}
 	 */
 	@Deprecated
@@ -81,7 +81,7 @@ public class RabbitTemplateConfigurer {
 	/**
 	 * Set the {@link RabbitProperties} to use.
 	 * @param rabbitProperties the {@link RabbitProperties}
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #RabbitTemplateConfigurer(RabbitProperties)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java
index 7406a1b5e6..b9767e6041 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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 @@ public final class SimpleRabbitListenerContainerFactoryConfigurer
 
 	/**
 	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #SimpleRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java
index 27cd382507..8f1b5c1d58 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Vedran Pavic
  * @since 1.0.0
- * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+ * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
  * {@link BatchDataSourceScriptDatabaseInitializer}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/DeprecatedReactiveElasticsearchRestClientProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/DeprecatedReactiveElasticsearchRestClientProperties.java
index cb879c531a..a8d7ac370c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/DeprecatedReactiveElasticsearchRestClientProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/DeprecatedReactiveElasticsearchRestClientProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.util.unit.DataSize;
  * Deprecated configuration properties for Elasticsearch Reactive REST clients.
  *
  * @author Brian Clozel
- * @deprecated since 2.6.0 for removal in 2.8.0
+ * @deprecated since 2.6.0 for removal in 3.0.0
  */
 @Deprecated
 @ConfigurationProperties(prefix = "spring.data.elasticsearch.client.reactive")
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/DeprecatedElasticsearchRestClientProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/DeprecatedElasticsearchRestClientProperties.java
index 373bc00c60..3019af3bde 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/DeprecatedElasticsearchRestClientProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/DeprecatedElasticsearchRestClientProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.boot.context.properties.DeprecatedConfigurationProper
  * Deprecated configuration properties for Elasticsearch REST clients.
  *
  * @author Brian Clozel
- * @deprecated since 2.6.0 for removal in 2.8.0.
+ * @deprecated since 2.6.0 for removal in 3.0.0.
  */
 @ConfigurationProperties(prefix = "spring.elasticsearch.rest")
 @Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationDataSourceInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationDataSourceInitializer.java
index 7f2663d139..a6f09f6f44 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationDataSourceInitializer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationDataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.StringUtils;
  *
  * @author Vedran Pavic
  * @since 2.0.0
- * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+ * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
  * {@link IntegrationDataSourceScriptDatabaseInitializer}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java
index 512d5f1811..728c519246 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.util.StringUtils;
  *
  * @author Vedran Pavic
  * @since 2.0.0
- * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+ * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
  * {@link QuartzDataSourceScriptDatabaseInitializer}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDataSourceInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDataSourceInitializer.java
index f855c52637..6f2eb6ee38 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDataSourceInitializer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.StringUtils;
  *
  * @author Vedran Pavic
  * @since 1.4.0
- * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+ * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
  * {@link JdbcSessionDataSourceScriptDatabaseInitializer}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java
index 001a902cc6..d85e567dea 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -127,7 +127,7 @@ public class WebFluxProperties {
 	/**
 	 * Session properties.
 	 *
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@code server.reactive.session}.
 	 */
 	@Deprecated
@@ -145,7 +145,7 @@ public class WebFluxProperties {
 	/**
 	 * Session cookie properties.
 	 *
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link org.springframework.boot.web.server.Cookie}.
 	 */
 	@Deprecated
@@ -169,7 +169,7 @@ public class WebFluxProperties {
 
 	/**
 	 * SameSite values.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link org.springframework.boot.web.server.Cookie.SameSite}.
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java
index 012b311b07..b8a3de9cae 100644
--- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java
+++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java
@@ -32,7 +32,7 @@ import org.eclipse.aether.repository.RemoteRepository;
  * @author Andy Wilkinson
  * @author Phillip Webb
  * @since 1.0.0
- * @deprecated since 2.5.9 for removal in 2.8.0 in favor of
+ * @deprecated since 2.5.9 for removal in 3.0.0 in favor of
  * {@link MavenResolverGrapeEngine}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java
index 5465051e8f..1f695ae4af 100644
--- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java
+++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java
@@ -40,7 +40,7 @@ import org.eclipse.aether.transport.http.HttpTransporterFactory;
  *
  * @author Andy Wilkinson
  * @since 1.0.0
- * @deprecated since 2.5.9 for removal in 2.8.0 in favor of
+ * @deprecated since 2.5.9 for removal in 3.0.0 in favor of
  * {@link MavenResolverGrapeEngineFactory}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java
index 073e109a8b..e03cd6652a 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -113,7 +113,7 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
 	/**
 	 * Create a new {@link AbstractApplicationContextRunner} instance.
 	 * @param contextFactory the factory used to create the actual context
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #AbstractApplicationContextRunner(Supplier, Function)}
 	 */
 	@Deprecated
@@ -162,7 +162,7 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
 	 * @param parent the parent
 	 * @param beanRegistrations the bean registrations
 	 * @param configurations the configuration
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #AbstractApplicationContextRunner(Supplier, Function)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/application/CreateBootStartScripts.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/application/CreateBootStartScripts.java
index 2fd040e7c8..051376976a 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/application/CreateBootStartScripts.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/application/CreateBootStartScripts.java
@@ -25,7 +25,7 @@ import org.gradle.jvm.application.tasks.CreateStartScripts;
  *
  * @author Andy Wilkinson
  * @since 2.0.0
- * @deprecated since 2.5.10 for removal in 2.8.0 in favor of {@link CreateStartScripts}.
+ * @deprecated since 2.5.10 for removal in 3.0.0 in favor of {@link CreateStartScripts}.
  */
 @Deprecated
 public class CreateBootStartScripts extends CreateStartScripts {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java
index feb92d0bca..7b8df16650 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -90,7 +90,7 @@ public interface SpringApplicationRunListener {
 	 * ApplicationRunners} have not been called.
 	 * @param context the application context.
 	 * @since 2.0.0
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #started(ConfigurableApplicationContext, Duration)}
 	 */
 	@Deprecated
@@ -116,7 +116,7 @@ public interface SpringApplicationRunListener {
 	 * {@link ApplicationRunner ApplicationRunners} have been called.
 	 * @param context the application context.
 	 * @since 2.0.0
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #ready(ConfigurableApplicationContext, Duration)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
index ac18433f34..2b08f2bae3 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -108,7 +108,7 @@ public class SpringApplicationBuilder {
 	 * @param sources the sources
 	 * @return the {@link SpringApplication} instance
 	 * @since 1.1.0
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #createSpringApplication(ResourceLoader, Class...)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java
index 9e7b89ee44..84bc131ddc 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -44,7 +44,7 @@ public class ApplicationReadyEvent extends SpringApplicationEvent {
 	 * @param application the current application
 	 * @param args the arguments the application is running with
 	 * @param context the context that was being created
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #ApplicationReadyEvent(SpringApplication, String[], ConfigurableApplicationContext, Duration)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartedEvent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartedEvent.java
index 0ff27b2c6a..8f781a8a53 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartedEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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 ApplicationStartedEvent extends SpringApplicationEvent {
 	 * @param application the current application
 	 * @param args the arguments the application is running with
 	 * @param context the context that was being created
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #ApplicationStartedEvent(SpringApplication, String[], ConfigurableApplicationContext, Duration)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java
index fa23d5c703..7048de290f 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  * @author Vedran Pavic
  * @author Stephane Nicoll
  * @since 1.5.0
- * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+ * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
  * {@link DataSourceScriptDatabaseInitializer}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceInitializationMode.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceInitializationMode.java
index 27672ee984..929128c13c 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceInitializationMode.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceInitializationMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.springframework.boot.sql.init.DatabaseInitializationMode;
  * @author Stephane Nicoll
  * @since 2.0.0
  * @see AbstractDataSourceInitializer
- * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+ * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
  * {@link DatabaseInitializationMode}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
index 8dba1b2e7a..6242ace3ca 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -197,7 +197,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
 	 * Load the configuration from the given {@code location}.
 	 * @param location the location
 	 * @param logFile log file configuration
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+	 * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
 	 * {@link #loadConfiguration(String, LogFile, List)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java
index 6937f7b67f..655f2fac27 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
  * @author Phillip Webb
  * @author Madhura Bhave
  * @since 1.4.0
- * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
+ * @deprecated since 2.6.0 for removal in 3.0.0 in favor of
  * {@link CamelCaseToUnderscoresNamingStrategy}
  */
 @Deprecated