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
index 3dc9eb3148..ea6f07d9c4 100644
--- 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 final class MeterValue {
 	 * Return a new {@link MeterValue} instance for the given long value.
 	 * @param value the source value
 	 * @return a {@link MeterValue} instance
-	 * @deprecated 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
index c9a836c494..029dae1f6a 100644
--- 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 @@ import io.micrometer.core.instrument.Meter;
  *
  * @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-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
index 48713cff20..c4e1198828 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
@@ -137,7 +137,7 @@ public class ManagementServerProperties {
 		 * Return the context path with no trailing slash (i.e. the '/' root context is
 		 * represented as the empty string).
 		 * @return the context path (no trailing slash)
-		 * @deprecated since 2.4 for removal in 2.6 in favor of
+		 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 		 * {@link ManagementServerProperties#getBasePath()}
 		 */
 		@Deprecated
@@ -149,7 +149,7 @@ public class ManagementServerProperties {
 		/**
 		 * Set the context path.
 		 * @param contextPath the context path
-		 * @deprecated since 2.4 for removal in 2.6 in favor of
+		 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 		 * {@link ManagementServerProperties#setBasePath(String)}
 		 */
 		@Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java
index 08c61007c6..dffc334aa7 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  * @author Julien Dubois
  * @author Alexandre Dutra
  * @since 2.0.0
- * @deprecated since 2.4 for removal in 2.6 in favor of
+ * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
  * {@link CassandraDriverHealthIndicator}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicator.java
index 572769ca71..83dd9d9444 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicator.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicator.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  *
  * @author Artsiom Yudovin
  * @since 2.1.0
- * @deprecated since 2.4 for removal in 2.6 in favor of
+ * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
  * {@link CassandraDriverHealthIndicator}
  */
 @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
index 2ff11ac605..07717433bd 100644
--- 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 @@ public class CachingOperationInvoker implements OperationInvoker {
 	 * @param timeToLive the maximum time in milliseconds that a response can be cached
 	 * @return a caching version of the invoker or the original instance if caching is not
 	 * required
-	 * @deprecated 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/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
index 1a15e69577..cdd52b57be 100644
--- 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 final class WebClientExchangeTags {
 	 * {@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 final class WebClientExchangeTags {
 	 * 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
index 5cb25cc4f7..3f8593559e 100644
--- 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 @@ import org.springframework.boot.ApplicationRunner;
  * @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
index 3df190e39f..540564eff7 100644
--- 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(List)}
 	 */
 	@Deprecated
@@ -56,7 +56,7 @@ public class MongoClientFactory extends MongoClientFactorySupport<MongoClient> {
 	 * @param properties configuration properties
 	 * @param environment a Spring {@link Environment} containing configuration properties
 	 * @param builderCustomizers a list of configuration settings customizers
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #MongoClientFactory(List)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
index 56023d0ee2..7b9d3cc43e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
@@ -198,7 +198,8 @@ public class MongoProperties {
 	/**
 	 * Return the GridFS database name.
 	 * @return the GridFS database name
-	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link Gridfs#getDatabase()}
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
+	 * {@link Gridfs#getDatabase()}
 	 */
 	@DeprecatedConfigurationProperty(replacement = "spring.data.mongodb.gridfs.database")
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
index 51c21f391e..7c7a073d0b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
@@ -38,7 +38,7 @@ 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 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #ReactiveMongoClientFactory(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
index ce9942d738..2133417f10 100644
--- 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
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
  * @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/ResourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
index 352ff472e3..ad3d2aac76 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
@@ -31,7 +31,8 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
  * @author Venil Noronha
  * @author Kristine Jetzke
  * @since 1.1.0
- * @deprecated since 2.4 for removal in 2.6 in favor of {@link WebProperties.Resources}
+ * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
+ * {@link WebProperties.Resources}
  */
 @Deprecated
 @ConfigurationProperties(prefix = "spring.resources", ignoreUnknownFields = false)
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
index 60a19346af..4b598031ca 100644
--- 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
index 1c91f3c7d5..35ac827b16 100644
--- 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
@@ -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 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #AbstractErrorWebExceptionHandler(ErrorAttributes, Resources, ApplicationContext)}
 	 */
 	@Deprecated
@@ -157,7 +157,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
 	 * @param request the source request
 	 * @param includeStackTrace whether to include the error stacktrace information
 	 * @return the error attributes as a Map
-	 * @deprecated since 2.3 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/reactive/error/DefaultErrorWebExceptionHandler.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
index ffa8716e33..1b9b992a7c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
+++ b/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 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #DefaultErrorWebExceptionHandler(ErrorAttributes, Resources, ErrorProperties, ApplicationContext)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
index 818125b04d..a8f6158186 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
@@ -553,7 +553,7 @@ public class WebMvcProperties {
 
 	/**
 	 * Locale resolution options.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link org.springframework.boot.autoconfigure.web.WebProperties.LocaleResolver}
 	 */
 	@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
index 5b23af0fe8..c7f8495c77 100644
--- 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 @@ public abstract class AbstractErrorController implements ErrorController {
 	 * @param request the source request
 	 * @param includeStackTrace if stack trace elements should be included
 	 * @return the error attributes
-	 * @deprecated since 2.3 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-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java
index ad108e62b7..0a8ed8128b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java
@@ -78,7 +78,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
 	 * Create a new {@link DefaultErrorViewResolver} instance.
 	 * @param applicationContext the source application context
 	 * @param resourceProperties resource properties
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #DefaultErrorViewResolver(ApplicationContext, Resources)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializer.java
index 4041ef7273..02f3ab0ac1 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializer.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializer.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.ContextConfiguration;
  * @author Phillip Webb
  * @since 1.4.0
  * @see org.springframework.boot.context.config.ConfigFileApplicationListener
- * @deprecated since 2.4 for removal in 2.6 in favor of
+ * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
  * {@link ConfigDataApplicationContextInitializer}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java
index 22a3d0af8f..e72d26f482 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java
@@ -314,7 +314,7 @@ public final class TestPropertyValues {
 		 * Create a new {@link Pair} instance.
 		 * @param name the name
 		 * @param value the value
-		 * @deprecated since 2.4 for removal in 2.6 in favor of
+		 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 		 * {@link #of(String, String)}
 		 */
 		@Deprecated
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java
index 9b1487ef43..677a330db5 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java
@@ -47,7 +47,7 @@ public interface BuildLog {
 	 * @param request the build request
 	 * @param imageReference the builder image reference
 	 * @return a consumer for progress update events
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #pullingImage(ImageReference, ImageType)}
 	 */
 	@Deprecated
@@ -57,7 +57,7 @@ public interface BuildLog {
 	 * Log that the builder image has been pulled.
 	 * @param request the build request
 	 * @param image the builder image that was pulled
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #pulledImage(Image, ImageType)}
 	 */
 	@Deprecated
@@ -68,7 +68,7 @@ public interface BuildLog {
 	 * @param request the build request
 	 * @param imageReference the run image reference
 	 * @return a consumer for progress update events
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #pullingImage(ImageReference, ImageType)}
 	 */
 	@Deprecated
@@ -78,7 +78,7 @@ public interface BuildLog {
 	 * Log that a run image has been pulled.
 	 * @param request the build request
 	 * @param image the run image that was pulled
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #pulledImage(Image, ImageType)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
index f2ee81cd44..fa81dcf344 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
@@ -68,7 +68,7 @@ public class SpringBootExtension {
 	/**
 	 * Returns the fully-qualified main class name of the application.
 	 * @return the fully-qualified name of the application's main class
-	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass()}.
 	 */
 	@Deprecated
 	@ReplacedBy("mainClass")
@@ -79,7 +79,7 @@ public class SpringBootExtension {
 	/**
 	 * Sets the fully-qualified main class name of the application.
 	 * @param mainClassName the fully-qualified name of the application's main class
-	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass} and
 	 * {@link Property#set(Object)}
 	 */
 	@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
index 867fd1afe0..f1a044c535 100644
--- 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
@@ -47,7 +47,7 @@ public interface BootArchive extends Task {
 	/**
 	 * Returns the fully-qualified main class name of the application.
 	 * @return the fully-qualified name of the application's main class
-	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass()}.
 	 */
 	@Deprecated
 	@ReplacedBy("mainClass")
@@ -56,7 +56,7 @@ public interface BootArchive extends Task {
 	/**
 	 * Sets the fully-qualified main class name of the application.
 	 * @param mainClassName the fully-qualified name of the application's main class
-	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass} and
 	 * {@link Property#set(Object)}
 	 */
 	@Deprecated
@@ -133,8 +133,8 @@ public interface BootArchive extends Task {
 	 * {@code false}.
 	 * @return {@code true} if the Devtools jar should be excluded, or {@code false} if
 	 * not
-	 * @deprecated since 2.3 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
@@ -144,8 +144,8 @@ public interface BootArchive extends Task {
 	 * Sets whether or not the Devtools jar should be excluded.
 	 * @param excludeDevtools {@code true} if the Devtools jar should be excluded, or
 	 * {@code false} if not
-	 * @deprecated since 2.3 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-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
index e89ca3e8cd..5f2aa9d243 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
@@ -197,7 +197,7 @@ public class BootJar extends Jar implements BootArchive {
 	/**
 	 * Configures the jar to be layered using the default layering.
 	 * @since 2.3.0
-	 * @deprecated since 2.4 for removal in 2.6 as layering as now enabled by default.
+	 * @deprecated since 2.4.0 for removal in 2.6.0 as layering as now enabled by default.
 	 */
 	@Deprecated
 	public void layered() {
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
index fb690c4cf5..ca4f838071 100644
--- 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 @@ public interface Layout {
 	 * @param scope the scope of the library
 	 * @return the destination relative to the root of the archive (should end with '/')
 	 * or {@code null} if the library should not be included.
-	 * @deprecated since 2.3 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
index a292635f69..a2e8c249b8 100644
--- 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 @@ public abstract class Launcher {
 	 * @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 @@ public abstract class Launcher {
 	 * Returns the archives that will be used to construct the class path.
 	 * @return the class path archives
 	 * @throws Exception if the class path archives cannot be obtained
-	 * @deprecated since 2.3 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
index de1bf3761c..a62940370f 100644
--- 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 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	 * @param filter the filter used to limit entries
 	 * @return nested archives
 	 * @throws IOException if nested archives cannot be read
-	 * @deprecated since 2.3 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 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	/**
 	 * Return a new iterator for the archive entries.
 	 * @see java.lang.Iterable#iterator()
-	 * @deprecated since 2.3 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 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	 * Performs the given action for each element of the {@code Iterable} until all
 	 * elements have been processed or the action throws an exception.
 	 * @see Iterable#forEach
-	 * @deprecated since 2.3 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 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
 	/**
 	 * Creates a {@link Spliterator} over the elements described by this {@code Iterable}.
 	 * @see Iterable#spliterator
-	 * @deprecated since 2.3 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
index f22f8ad984..72b25bd2da 100644
--- 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-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
index d764d89572..e73263eb1b 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
@@ -70,7 +70,7 @@ public class ArtifactsLibraries implements Libraries {
 	 * @param artifacts the artifacts to represent as libraries
 	 * @param unpacks artifacts that should be unpacked on launch
 	 * @param log the log
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #ArtifactsLibraries(Set, Collection, Collection, Log)}
 	 */
 	@Deprecated
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
index 37bc510e09..7c44b063c4 100644
--- 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
@@ -164,7 +164,7 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for non-web
 	 * environments.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of using a
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of using a
 	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
@@ -174,7 +174,7 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for web
 	 * environments.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of using an
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of using an
 	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
@@ -184,7 +184,7 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for reactive web
 	 * environments.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of using an
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of using an
 	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
@@ -765,7 +765,7 @@ public class SpringApplication {
 	/**
 	 * 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
@@ -1221,7 +1221,7 @@ public class SpringApplication {
 	 * applications or {@link AnnotationConfigApplicationContext} for non web based
 	 * applications.
 	 * @param applicationContextClass the context class to set
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #setApplicationContextFactory(ApplicationContextFactory)}
 	 */
 	@Deprecated
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 1d8081da0e..70f8092e94 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
@@ -47,7 +47,7 @@ public interface SpringApplicationRunListener {
 	/**
 	 * Called immediately when the run method has first started. Can be used for very
 	 * early initialization.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #starting(ConfigurableBootstrapContext)}
 	 */
 	@Deprecated
@@ -69,7 +69,7 @@ public interface SpringApplicationRunListener {
 	 * Called once the environment has been prepared, but before the
 	 * {@link ApplicationContext} has been created.
 	 * @param environment the environment
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #environmentPrepared(ConfigurableBootstrapContext, ConfigurableEnvironment)}
 	 */
 	@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 60dc89c84e..ad8ac8bc08 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
@@ -276,7 +276,7 @@ public class SpringApplicationBuilder {
 	 * Explicitly set the context class to be used.
 	 * @param cls the context class to use
 	 * @return the current builder
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #contextFactory(ApplicationContextFactory)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
index 2b80da96d5..8a12031f5c 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
@@ -107,7 +107,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor
 
 	/**
 	 * Create a new {@link CloudFoundryVcapEnvironmentPostProcessor} instance.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #CloudFoundryVcapEnvironmentPostProcessor(Log)}
 	 */
 	@Deprecated
@@ -154,7 +154,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor
 
 	/**
 	 * Event listener used to switch logging.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of only using
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of only using
 	 * {@link EnvironmentPostProcessor} callbacks
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
index 75970f778a..ee4f6b48a8 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
@@ -112,7 +112,7 @@ import org.springframework.util.StringUtils;
  * @author Madhura Bhave
  * @author Scott Frederick
  * @since 1.0.0
- * @deprecated since 2.4 for removal in 2.6 in favor of
+ * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
  * {@link ConfigDataEnvironmentPostProcessor}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.java
index 12907c0cef..c881067abf 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.java
@@ -28,7 +28,7 @@ import org.springframework.core.env.PropertySource;
  * {@link ConfigFileApplicationListener} to filter out properties for specific operations.
  *
  * @author Phillip Webb
- * @deprecated since 2.4 for removal in 2.6 along with
+ * @deprecated since 2.4.0 for removal in 2.6.0 along with
  * {@link ConfigFileApplicationListener}
  */
 @Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
index a5c9c7f6ba..57fbd7ecd5 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
@@ -40,7 +40,7 @@ public class ApplicationEnvironmentPreparedEvent extends SpringApplicationEvent
 	 * @param application the current application
 	 * @param args the arguments the application is running with
 	 * @param environment the environment that was just created
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #ApplicationEnvironmentPreparedEvent(ConfigurableBootstrapContext, SpringApplication, String[], ConfigurableEnvironment)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
index 8987e45d12..fe820fc7d3 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
@@ -42,7 +42,7 @@ public class ApplicationStartingEvent extends SpringApplicationEvent {
 	 * Create a new {@link ApplicationStartingEvent} instance.
 	 * @param application the current application
 	 * @param args the arguments the application is running with
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #ApplicationStartingEvent(ConfigurableBootstrapContext, SpringApplication, String[])}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.java
index f7e4d3b2f7..8a3e48667e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.java
@@ -38,7 +38,7 @@ import org.springframework.core.ResolvableType;
  *
  * @author Andy Wilkinson
  * @since 2.0.0
- * @deprecated since 2.4 for removal in 2.6 with no direct replacement.
+ * @deprecated since 2.4.0 for removal in 2.6.0 with no direct replacement.
  * {@link FailureAnalysis} is now the preferred approach for diagnosing and reporting
  * startup failures.
  */
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
index 199dbc5d5d..8fe339fe94 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
@@ -63,7 +63,7 @@ public enum EmbeddedDatabaseConnection {
 
 	/**
 	 * HSQL Database Connection.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link EmbeddedDatabaseConnection#HSQLDB}.
 	 */
 	@Deprecated
@@ -141,7 +141,7 @@ public enum EmbeddedDatabaseConnection {
 	 * database type.
 	 * @param driverClass the driver class
 	 * @return true if the driver class is one of the embedded types
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link #isEmbedded(String, String)}
 	 */
 	@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
index d8069bd9d1..c86405f514 100644
--- 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 @@ import org.springframework.core.Ordered;
  *
  * @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
index 172e85827b..26e2779304 100644
--- 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 @@ import org.springframework.boot.jms.XAConnectionFactoryWrapper;
  *
  * @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
index a6db6c5a8a..7b88c8de4e 100644
--- 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 @@ import org.springframework.boot.jdbc.XADataSourceWrapper;
  *
  * @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
index 03dd7f7904..a22394a998 100644
--- 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
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  * @author Josh Long
  * @author Andy Wilkinson
  * @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/PoolingDataSourceBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
index 11c23ef836..5f9219b7f7 100644
--- 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
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  * @author Josh Long
  * @author Andy Wilkinson
  * @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/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java
index fd5d1c4b71..713cfd8d45 100644
--- 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
@@ -16,7 +16,7 @@
 
 /**
  * Support classes for Bitronix JTA.
- * @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
  */
 package org.springframework.boot.jta.bitronix;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
index 345df04157..170decee0e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
@@ -83,7 +83,7 @@ public class LoggingSystemProperties {
 	/**
 	 * The name of the System property that contains the rolled-over log file name
 	 * pattern.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_FILE_NAME_PATTERN}
 	 */
 	@Deprecated
@@ -91,7 +91,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the clean history on start flag.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_CLEAN_HISTORY_ON_START}
 	 */
 	@Deprecated
@@ -99,7 +99,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the file log max size.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_FILE_SIZE}
 	 */
 	@Deprecated
@@ -107,7 +107,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the file total size cap.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_TOTAL_SIZE_CAP}
 	 */
 	@Deprecated
@@ -115,7 +115,7 @@ public class LoggingSystemProperties {
 
 	/**
 	 * The name of the System property that contains the file log max history.
-	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_HISTORY}
 	 */
 	@Deprecated
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
index be793b99f5..11766192da 100644
--- 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
@@ -51,7 +51,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
 	 * @param contextPath the root context path
 	 * @param autoStart if the server should be started
 	 * @param compression compression configuration
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
 	 */
 	@Deprecated
@@ -68,7 +68,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
 	 * @param useForwardHeaders if x-forward headers should be used
 	 * @param autoStart if the server should be started
 	 * @param compression compression configuration
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
 	 */
 	@Deprecated
@@ -86,7 +86,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
 	 * @param autoStart if the server should be started
 	 * @param compression compression configuration
 	 * @param serverHeader string to be used in HTTP header
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
 	 */
 	@Deprecated
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
index 6fbe47525e..70bfe1512d 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
@@ -250,7 +250,8 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
 	 * Return if filters should be initialized eagerly.
 	 * @return {@code true} if filters are initialized eagerly, otherwise {@code false}.
 	 * @since 2.0.0
-	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
+	 * {@link #isEagerFilterInit()}
 	 */
 	@Deprecated
 	public boolean isEagerInitFilters() {
@@ -262,7 +263,8 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
 	 * @param eagerInitFilters {@code true} if filters are initialized eagerly, otherwise
 	 * {@code false}.
 	 * @since 2.0.0
-	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
+	 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
+	 * {@link #isEagerFilterInit()}
 	 */
 	@Deprecated
 	public void setEagerInitFilters(boolean eagerInitFilters) {
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
index a6c4809fb2..2b4d9afedd 100644
--- 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
@@ -92,7 +92,7 @@ public class UndertowWebServer implements WebServer {
 	 * @param autoStart if the server should be started
 	 * @param closeable called when the server is stopped
 	 * @since 2.0.4
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #UndertowWebServer(io.undertow.Undertow.Builder, Iterable, boolean)}
 	 */
 	@Deprecated
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
index cc5d0069b2..734d03e334 100644
--- 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
@@ -75,7 +75,7 @@ public class DefaultErrorAttributes implements ErrorAttributes {
 	/**
 	 * Create a new {@link DefaultErrorAttributes} instance.
 	 * @param includeException whether to include the "exception" attribute
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link ErrorAttributeOptions#including(Include...)}
 	 */
 	@Deprecated
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
index 182a45d6bc..5afabfa27c 100644
--- 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
@@ -41,7 +41,7 @@ public interface ErrorAttributes {
 	 * @param request the source request
 	 * @param includeStackTrace if stack trace attribute should be included
 	 * @return a map of error attributes
-	 * @deprecated since 2.3 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/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
index ca8bd5c43f..8cb9e0af48 100644
--- 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
@@ -82,7 +82,7 @@ public class DefaultErrorAttributes implements ErrorAttributes, HandlerException
 	/**
 	 * Create a new {@link DefaultErrorAttributes} instance.
 	 * @param includeException whether to include the "exception" attribute
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link ErrorAttributeOptions#including(Include...)}
 	 */
 	@Deprecated
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
index dbd1096765..eb0c7c3f10 100644
--- 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
@@ -42,7 +42,7 @@ public interface ErrorAttributes {
 	 * @param webRequest the source request
 	 * @param includeStackTrace if stack trace element should be included
 	 * @return a map of error attributes
-	 * @deprecated since 2.3 for removal in 2.5 in favor of
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of
 	 * {@link #getErrorAttributes(WebRequest, ErrorAttributeOptions)}
 	 */
 	@Deprecated
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
index b15bbfd63e..380e008940 100644
--- 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
@@ -33,7 +33,7 @@ public interface ErrorController {
 	 * The return value from this method is not used; the property `server.error.path`
 	 * must be set to override the default error page path.
 	 * @return the error path
-	 * @deprecated since 2.3 for removal in 2.5 in favor of setting the property
+	 * @deprecated since 2.3.0 for removal in 2.5.0 in favor of setting the property
 	 * `server.error.path`
 	 */
 	@Deprecated