From 7e88daf288fa5629e6bba3b7236423ff0142b32a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 11:12:09 +0100 Subject: [PATCH] Update messages for APIs deprecated in 2.7 In all likelihood there will not be a 2.9 release so this commit updates the message for deprecations made in 2.7 to indicate that removal will not occur until 3.0. See gh-30903 --- .../actuate/autoconfigure/web/server/LocalManagementPort.java | 2 +- .../actuate/elasticsearch/ElasticsearchRestHealthIndicator.java | 2 +- .../main/java/org/springframework/boot/jdbc/DatabaseDriver.java | 2 +- .../boot/rsocket/context/LocalRSocketServerPort.java | 2 +- .../org/springframework/boot/web/server/LocalServerPort.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/LocalManagementPort.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/LocalManagementPort.java index e4404b9d997..dfceb07a1df 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/LocalManagementPort.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/LocalManagementPort.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Value; * Annotation at the field or method/constructor parameter level that injects the HTTP * management port that got allocated at runtime. Provides a convenient alternative for * @Value("${local.management.port}"). - * @deprecated since 2.7.0 for removal in 2.9.0 in favor of + * @deprecated since 2.7.0 for removal in 3.0.0 in favor of * {@code org.springframework.boot.test.web.server.LocalManagementPort} * @author Stephane Nicoll * @since 2.0.0 diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicator.java index 1e9f78e8e63..658661b1b51 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicator.java @@ -27,7 +27,7 @@ import org.springframework.boot.actuate.health.HealthIndicator; * @author Brian Clozel * @author Filip Hrisafov * @since 2.1.1 - * @deprecated since 2.7.0 for removal in 2.9.0 in favor of + * @deprecated since 2.7.0 for removal in 3.0.0 in favor of * {@link ElasticsearchRestClientHealthIndicator} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index 0898fa0b851..7dac152282d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -78,7 +78,7 @@ public enum DatabaseDriver { /** * Google App Engine. - * @deprecated since 2.7.0 for removal in 2.9.0 without replacement following the + * @deprecated since 2.7.0 for removal in 3.0.0 without replacement following the * removal of AppEngineDriver from version 2.0 of the AppEngine API SDK. */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/LocalRSocketServerPort.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/LocalRSocketServerPort.java index b64f4ca3d5c..035b8d84fe9 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/LocalRSocketServerPort.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/LocalRSocketServerPort.java @@ -32,7 +32,7 @@ import org.springframework.beans.factory.annotation.Value; * @author Verónica Vásquez * @author Eddú Meléndez * @since 2.2.0 - * @deprecated since 2.7.0 for removal in 2.9.0 in favor of + * @deprecated since 2.7.0 for removal in 3.0.0 in favor of * {@code org.springframework.boot.test.rsocket.LocalRSocketServerPort} */ @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE }) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/LocalServerPort.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/LocalServerPort.java index c522d48d0af..94cc9f4f565 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/LocalServerPort.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/LocalServerPort.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Value; * Annotation at the field or method/constructor parameter level that injects the HTTP * port that got allocated at runtime. Provides a convenient alternative for * @Value("${local.server.port}"). - * @deprecated since 2.7.0 for removal in 2.9.0 in favor or + * @deprecated since 2.7.0 for removal in 3.0.0 in favor or * {@code org.springframework.boot.test.web.server.LocalServerPort} * * @author Anand Shah