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
index d3ae11c1e1..9a6b1b0ca2 100644
--- 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 @@ import org.springframework.core.ResolvableType;
  * @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
index fdb76071ec..ca910ef73c 100644
--- 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 @@ import org.springframework.core.ResolvableType;
  * @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
index 9119ac73b6..52159eb784 100644
--- 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 @@ import org.springframework.context.annotation.Configuration;
  * @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
index 0e93ea6400..ccd96da1ee 100644
--- 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 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
  *
  * @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
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/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/health/AbstractHealthAggregator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
index 98bce01d10..643ca7faed 100644
--- 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 @@ import java.util.stream.Collectors;
  * @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
index e41eae5ecc..00c5709226 100644
--- 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 @@ import java.util.Map;
  * @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
index 96baca0997..570a3e3726 100644
--- 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 @@ import reactor.util.function.Tuple2;
  *
  * @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
index 78af444f7e..8a0136b503 100644
--- 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 @@ import org.springframework.util.Assert;
  * @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
index ead88d068a..66bc737d6a 100644
--- 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 @@ import org.springframework.util.Assert;
  * @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
index 1b47fbb1a8..bf876a08e3 100644
--- 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 @@ import java.util.Map;
  *
  * @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
index 29a4f603df..a58bfc307e 100644
--- 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 @@ package org.springframework.boot.actuate.health;
  * @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
index 2ce14fc41b..28f7355fd4 100644
--- 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 @@ import org.springframework.util.Assert;
  *
  * @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
index 545b08128f..eb91ee8ca2 100644
--- 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 @@ import java.util.Map;
  * @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
index 5bbec34a56..fc6c18055f 100644
--- 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 @@ import org.springframework.util.Assert;
  *
  * @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
index d975d316fb..c846ad1aa6 100644
--- 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 @@ import org.springframework.util.Assert;
  *
  * @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
index c58191fa47..fb877b957c 100644
--- 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 @@ import java.util.Map;
  * @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
index 19efe9943c..9ab03e88f1 100644
--- 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 @@ import org.springframework.util.ObjectUtils;
  *
  * @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
index 1ca0b592cb..9eaefa485c 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 458b04db1e..7d97bd1a55 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(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
index 8bf4af32e1..8b91f0b105 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
@@ -51,7 +51,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/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 c96273bec8..0a2263d9de 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
@@ -135,7 +135,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/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-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 57efb7c666..3aab4566fc 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
@@ -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
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/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
index ca6d1beaad..621f6a8114 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
@@ -738,7 +738,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
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
index bd095402ba..26d39e00b6 100644
--- 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 @@ import org.springframework.core.annotation.AnnotationUtils;
  *
  * @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
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/web/embedded/undertow/UndertowServletWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java
index f69065bb8d..fcb96683f1 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/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 33155996dc..d00b02727f 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
@@ -81,7 +81,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