Consistent use of @deprecated since

philwebb · philwebb · commit 9c8a97809dcb · 2021-03-30T09:20:30.000-07:00
Restore the patch version number for consistency with `@since` tags. See gh-25808
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java
@@ -34,7 +34,7 @@
  * @param <S> the bean source type
  * @author Stephane Nicoll
  * @since 2.0.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link CompositeHealthContributorConfiguration}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java
@@ -33,7 +33,7 @@
  * @param <S> the bean source type
  * @author Stephane Nicoll
  * @since 2.0.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link CompositeReactiveHealthContributorConfiguration}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java
@@ -29,7 +29,7 @@
  * @author Phillip Webb
  * @author Vedran Pavic
  * @since 2.0.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link HealthContributorAutoConfiguration}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.java
@@ -29,7 +29,8 @@
  *
  * @author Christian Dupuis
  * @since 2.0.0
- * @deprecated since 2.2 for removal in 2.4 in favor of {@link HealthEndpointProperties}
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
+ * {@link HealthEndpointProperties}
  */
 @Deprecated
 @ConfigurationProperties(prefix = "management.health.status")
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java
@@ -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 since 2.3 for removal in 2.5 in favor of {@link #valueOf(double)}
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of {@link #valueOf(double)}
 	 */
 	@Deprecated
 	public static MeterValue valueOf(long value) {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java
@@ -27,7 +27,7 @@
  *
  * @author Phillip Webb
  * @since 2.0.0
- * @deprecated since 2.3 for removal in 2.5 in favor of
+ * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
  * {@link ServiceLevelObjectiveBoundary}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java
@@ -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 since 2.3 for removal in 2.5
+	 * @deprecated since 2.3.0 for removal in 2.5.0
 	 */
 	@Deprecated
 	public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) {
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
@@ -28,7 +28,7 @@
  * @author Christian Dupuis
  * @author Vedran Pavic
  * @since 1.1.0
- * @deprecated since 2.2 for removal in 2.4 as {@link HealthAggregator} has been
+ * @deprecated since 2.2.0 for removal in 2.4.0 as {@link HealthAggregator} has been
  * deprecated
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java
@@ -26,7 +26,7 @@
  * @author Phillip Webb
  * @author Christian Dupuis
  * @since 1.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
  * {@link CompositeHealthContributor}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java
@@ -30,7 +30,7 @@
  *
  * @author Stephane Nicoll
  * @since 2.0.0
- * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
  * {@link CompositeReactiveHealthContributor}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.java
@@ -28,7 +28,8 @@
  * @author Vedran Pavic
  * @author Stephane Nicoll
  * @since 2.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry}
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
+ * {@link DefaultContributorRegistry}
  */
 @Deprecated
 public class DefaultHealthIndicatorRegistry implements HealthIndicatorRegistry {
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.java
@@ -28,7 +28,8 @@
  * @author Vedran Pavic
  * @author Stephane Nicoll
  * @since 2.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry}
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
+ * {@link DefaultContributorRegistry}
  */
 @Deprecated
 public class DefaultReactiveHealthIndicatorRegistry implements ReactiveHealthIndicatorRegistry {
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java
@@ -32,7 +32,7 @@
  *
  * @author Christian Dupuis
  * @since 1.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of {@link StatusAggregator}
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of {@link StatusAggregator}
  */
 @FunctionalInterface
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.java
@@ -22,7 +22,7 @@
  * @author Stephane Nicoll
  * @author Phillip Webb
  * @since 2.0.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link HealthContributorNameFactory}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java
@@ -27,7 +27,7 @@
  *
  * @author Stephane Nicoll
  * @since 2.0.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link ReactiveHealthContributor#adapt(HealthContributor)}
  * @see ReactiveHealthContributor#adapt(HealthContributor)
  */
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.java
@@ -28,7 +28,7 @@
  * @author Stephane Nicoll
  * @since 2.1.0
  * @see HealthEndpoint
- * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
  * {@link HealthContributorRegistry}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.java
@@ -26,7 +26,7 @@
  *
  * @author Stephane Nicoll
  * @since 2.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link DefaultHealthIndicatorRegistry}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
@@ -32,7 +32,7 @@
  *
  * @author Christian Dupuis
  * @since 1.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of {@link SimpleStatusAggregator}
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of {@link SimpleStatusAggregator}
  */
 @Deprecated
 public class OrderedHealthAggregator extends AbstractHealthAggregator {
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.java
@@ -28,7 +28,7 @@
  * @author Stephane Nicoll
  * @since 2.1.0
  * @see HealthIndicatorRegistry
- * @deprecated since 2.2 for removal in 2.4 in favor of a
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
  * {@link ReactiveHealthContributorRegistry}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.java
@@ -28,7 +28,7 @@
  *
  * @author Stephane Nicoll
  * @since 2.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link DefaultReactiveHealthIndicatorRegistry}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java
@@ -99,7 +99,7 @@ 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 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #status(ClientResponse, Throwable)}
 	 */
 	@Deprecated
@@ -112,7 +112,7 @@ public static Tag status(ClientResponse response) {
 	 * client.
 	 * @param throwable the exception
 	 * @return the status tag
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #status(ClientResponse, Throwable)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
@@ -30,7 +30,7 @@
  * @author Jean-Pierre Bergamin
  * @author Mahmoud Ben Hassine
  * @since 1.0.0
- * @deprecated since 2.3 for removal in 2.5 in favor of
+ * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
  * {@link JobLauncherApplicationRunner}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java
@@ -43,7 +43,7 @@ public class MongoClientFactory extends MongoClientFactorySupport<MongoClient> {
 	 * Construct a factory for creating a blocking {@link MongoClient}.
 	 * @param properties configuration properties
 	 * @param environment a Spring {@link Environment} containing configuration properties
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #MongoClientFactory(MongoProperties, Environment, List)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java
@@ -51,7 +51,7 @@
  * @author Phillip Webb
  * @author Andy Wilkinson
  * @author Kazuki Shimizu
- * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
  * maintained
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.java
@@ -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 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #WebConversionService(DateTimeFormatters)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java
@@ -135,7 +135,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 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java
@@ -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 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #getErrorAttributes(HttpServletRequest, ErrorAttributeOptions)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java
@@ -118,8 +118,8 @@ public interface BootArchive extends Task {
 	 * {@code false}.
 	 * @return {@code true} if the Devtools jar should be excluded, or {@code false} if
 	 * not
-	 * @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
-	 * does not include development-only dependencies
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of configuring a classpath
+	 * that does not include development-only dependencies
 	 */
 	@Input
 	@Deprecated
@@ -129,8 +129,8 @@ public interface BootArchive extends Task {
 	 * Sets whether or not the Devtools jar should be excluded.
 	 * @param excludeDevtools {@code true} if the Devtools jar should be excluded, or
 	 * {@code false} if not
-	 * @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
-	 * does not include development-only dependencies
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of configuring a classpath
+	 * that does not include development-only dependencies
 	 */
 	@Deprecated
 	void setExcludeDevtools(boolean excludeDevtools);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java
@@ -52,7 +52,8 @@ default String getLibraryLocation(String libraryName, LibraryScope scope) {
 	 * @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 for removal in 2.5 in favor of {@link #getLibraryLocation}
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
+	 * {@link #getLibraryLocation}
 	 */
 	@Deprecated
 	String getLibraryDestination(String libraryName, LibraryScope scope);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
@@ -63,7 +63,7 @@ protected void launch(String[] args) throws Exception {
 	 * @param archives the archives
 	 * @return the classloader
 	 * @throws Exception if the classloader cannot be created
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #createClassLoader(Iterator)}
 	 */
 	@Deprecated
@@ -140,7 +140,7 @@ protected Iterator<Archive> getClassPathArchivesIterator() throws Exception {
 	 * 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 for removal in 2.5 in favor of implementing
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of implementing
 	 * {@link #getClassPathArchivesIterator()}.
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
@@ -75,7 +75,7 @@ default Iterator<Archive> getNestedArchives(EntryFilter searchFilter, EntryFilte
 	 * @param filter the filter used to limit entries
 	 * @return nested archives
 	 * @throws IOException if nested archives cannot be read
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #getNestedArchives(EntryFilter, EntryFilter)}
 	 */
 	@Deprecated
@@ -86,7 +86,7 @@ default List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
 	/**
 	 * Return a new iterator for the archive entries.
 	 * @see java.lang.Iterable#iterator()
-	 * @deprecated since 2.3 for removal in 2.5 in favor of using
+	 * @deprecated since 2.3.0 for removal in 2.5.0 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 @@ default List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
 	 * 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 for removal in 2.5 in favor of using
+	 * @deprecated since 2.3.0 for removal in 2.5.0 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 @@ default void forEach(Consumer<? super Entry> action) {
 	/**
 	 * Creates a {@link Spliterator} over the elements described by this {@code Iterable}.
 	 * @see Iterable#spliterator
-	 * @deprecated since 2.3 for removal in 2.5 in favor of using
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
 	 * {@link org.springframework.boot.loader.jar.JarFile} to access entries and
 	 * {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
 	 */
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
@@ -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 for removal in 2.5 in favor of {@code directories}
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of {@code directories}
 	 */
 	@Deprecated
 	@Parameter(property = "spring-boot.run.folders")
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -738,7 +738,7 @@ protected BeanDefinitionLoader createBeanDefinitionLoader(BeanDefinitionRegistry
 	/**
 	 * Refresh the underlying {@link ApplicationContext}.
 	 * @param applicationContext the application context to refresh
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #refresh(ConfigurableApplicationContext)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.java
@@ -38,7 +38,7 @@
  *
  * @author Dave Syer
  * @since 1.1.0
- * @deprecated since 2.2 for removal in 2.4 in favor of
+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of
  * {@link ConfigurationPropertiesBean}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.java
@@ -32,7 +32,7 @@
  *
  * @author Phillip Webb
  * @since 1.2.0
- * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
  * maintained
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.java
@@ -27,7 +27,7 @@
  *
  * @author Phillip Webb
  * @since 1.2.0
- * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
  * maintained
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.java
@@ -26,7 +26,7 @@
  *
  * @author Phillip Webb
  * @since 1.2.0
- * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
+ * @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
  * maintained
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.java

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Phillip Webb`
`29`	`29`	`* @since 2.0.0`
`30`		`- * @deprecated since 2.3 for removal in 2.5 in favor of`
	`30`	`+ * @deprecated since 2.3.0 for removal in 2.5.0 in favor of`
`31`	`31`	`* {@link ServiceLevelObjectiveBoundary}`
`32`	`32`	`*/`
`33`	`33`	`@Deprecated`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @author Stephane Nicoll`
`32`	`32`	`* @since 2.0.0`
`33`		`- * @deprecated since 2.2 for removal in 2.4 in favor of a`
	`33`	`+ * @deprecated since 2.2.0 for removal in 2.4.0 in favor of a`
`34`	`34`	`* {@link CompositeReactiveHealthContributor}`
`35`	`35`	`*/`
`36`	`36`	`@Deprecated`