diff --git a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQAutoConfiguration.java b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQAutoConfiguration.java
index e8f83f453c..5545119606 100644
--- a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQAutoConfiguration.java
@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Import;
  * @author Stephane Nicoll
  * @author Phillip Webb
  * @author Eddú Meléndez
- * @since 3.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(before = JmsAutoConfiguration.class,
 		after = { JndiConnectionFactoryAutoConfiguration.class, JtaAutoConfiguration.class })
diff --git a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionDetails.java b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionDetails.java
index d2c312cdac..accf193938 100644
--- a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionDetails.java
+++ b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionDetails.java
@@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.service.connection.ConnectionDetai
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
- * @since 3.2.0
+ * @since 4.0.0
  */
 public interface ActiveMQConnectionDetails extends ConnectionDetails {
 
diff --git a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java
index 3ed0cd173d..e02f3c3f3e 100644
--- a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java
+++ b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java
@@ -23,7 +23,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
  * {@link ActiveMQConnectionFactory} whilst retaining default auto-configuration.
  *
  * @author Stephane Nicoll
- * @since 3.1.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface ActiveMQConnectionFactoryCustomizer {
diff --git a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQProperties.java b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQProperties.java
index d071348ca5..31990e6014 100644
--- a/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQProperties.java
+++ b/spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQProperties.java
@@ -32,7 +32,7 @@ import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryProper
  * @author Aurélien Leboulanger
  * @author Venil Noronha
  * @author Eddú Meléndez
- * @since 3.1.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.activemq")
 public class ActiveMQProperties {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java
index 795246d2bb..596769652a 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 2.6.0
+ * @since 4.0.0
  */
 public abstract class AbstractConnectionFactoryConfigurer<T extends AbstractConnectionFactory> {
 
@@ -56,7 +56,6 @@ public abstract class AbstractConnectionFactoryConfigurer<T extends AbstractConn
 	 * @param properties the properties to use to configure the connection factory
 	 * @param connectionDetails the connection details to use to configure the connection
 	 * factory
-	 * @since 3.1.0
 	 */
 	protected AbstractConnectionFactoryConfigurer(RabbitProperties properties,
 			RabbitConnectionDetails connectionDetails) {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java
index 763ec41d7a..e86430347d 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  * @param <T> the container factory type.
  * @author Gary Russell
  * @author Stephane Nicoll
- * @since 2.0.0
+ * @since 4.0.0
  */
 public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends AbstractRabbitListenerContainerFactory<?>> {
 
@@ -53,7 +53,6 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use
-	 * @since 2.6.0
 	 */
 	protected AbstractRabbitListenerContainerFactoryConfigurer(RabbitProperties rabbitProperties) {
 		this.rabbitProperties = rabbitProperties;
@@ -87,7 +86,6 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
 	/**
 	 * Set the task executor to use.
 	 * @param taskExecutor the task executor
-	 * @since 3.2.0
 	 */
 	public void setTaskExecutor(Executor taskExecutor) {
 		this.taskExecutor = taskExecutor;
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/CachingConnectionFactoryConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/CachingConnectionFactoryConfigurer.java
index ad1c486491..7c11e70618 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/CachingConnectionFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/CachingConnectionFactoryConfigurer.java
@@ -52,7 +52,6 @@ public class CachingConnectionFactoryConfigurer extends AbstractConnectionFactor
 	 * @param properties the properties to use to configure the connection factory
 	 * @param connectionDetails the connection details to use to configure the connection
 	 * factory
-	 * @since 3.1.0
 	 */
 	public CachingConnectionFactoryConfigurer(RabbitProperties properties, RabbitConnectionDetails connectionDetails) {
 		super(properties, connectionDetails);
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
index b3122accd6..99c7cf594d 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
@@ -23,7 +23,7 @@ import com.rabbitmq.client.ConnectionFactory;
  * auto-configured RabbitMQ {@link ConnectionFactory}.
  *
  * @author Andy Wilkinson
- * @since 2.5.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface ConnectionFactoryCustomizer {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java
index e2246e35c8..a8b28c95f0 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java
@@ -30,7 +30,7 @@ import org.springframework.boot.context.properties.PropertyMapper;
  *
  * @author Gary Russell
  * @author Stephane Nicoll
- * @since 2.0.0
+ * @since 4.0.0
  */
 public final class DirectRabbitListenerContainerFactoryConfigurer
 		extends AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> {
@@ -38,7 +38,6 @@ public final class DirectRabbitListenerContainerFactoryConfigurer
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use
-	 * @since 2.6.0
 	 */
 	public DirectRabbitListenerContainerFactoryConfigurer(RabbitProperties rabbitProperties) {
 		super(rabbitProperties);
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
index 760bd838d1..f3e824a72e 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
@@ -24,7 +24,7 @@ import com.rabbitmq.stream.EnvironmentBuilder;
  * auto-configured {@link Environment} that is created by an {@link EnvironmentBuilder}.
  *
  * @author Andy Wilkinson
- * @since 3.0.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface EnvironmentBuilderCustomizer {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java
index a45bcc6a83..4907fbfbbb 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java
@@ -71,7 +71,7 @@ import org.springframework.core.io.ResourceLoader;
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Scott Frederick
- * @since 1.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass({ RabbitTemplate.class, Channel.class })
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java
index 1d80a3d3c6..37da1c70ef 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.1.0
+ * @since 4.0.0
  */
 public interface RabbitConnectionDetails extends ConnectionDetails {
 
@@ -77,7 +77,6 @@ public interface RabbitConnectionDetails extends ConnectionDetails {
 	/**
 	 * SSL bundle to use.
 	 * @return the SSL bundle to use
-	 * @since 3.5.0
 	 */
 	default SslBundle getSslBundle() {
 		return null;
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java
index 8b598eeace..6bca84628f 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java
@@ -43,7 +43,7 @@ import org.springframework.util.unit.DataSize;
  * @author Andy Wilkinson
  * @author Phillip Webb
  * @author Scott Frederick
- * @since 2.6.0
+ * @since 4.0.0
  */
 public class RabbitConnectionFactoryBeanConfigurer {
 
@@ -74,7 +74,6 @@ public class RabbitConnectionFactoryBeanConfigurer {
 	 * @param resourceLoader the resource loader
 	 * @param properties the properties
 	 * @param connectionDetails the connection details
-	 * @since 3.1.0
 	 */
 	public RabbitConnectionFactoryBeanConfigurer(ResourceLoader resourceLoader, RabbitProperties properties,
 			RabbitConnectionDetails connectionDetails) {
@@ -89,7 +88,6 @@ public class RabbitConnectionFactoryBeanConfigurer {
 	 * @param properties the properties
 	 * @param connectionDetails the connection details
 	 * @param sslBundles the SSL bundles
-	 * @since 3.2.0
 	 */
 	public RabbitConnectionFactoryBeanConfigurer(ResourceLoader resourceLoader, RabbitProperties properties,
 			RabbitConnectionDetails connectionDetails, SslBundles sslBundles) {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java
index 16123afd72..cadaa9bba3 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java
@@ -48,7 +48,7 @@ import org.springframework.util.unit.DataSize;
  * @author Scott Frederick
  * @author Lasse Wulff
  * @author Yanming Zhou
- * @since 1.0.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.rabbitmq")
 public class RabbitProperties {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateCustomizer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateCustomizer.java
index 29b651daac..b849e91431 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateCustomizer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateCustomizer.java
@@ -25,7 +25,7 @@ import org.springframework.retry.support.RetryTemplate;
  * of the Rabbit infrastructure.
  *
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface RabbitRetryTemplateCustomizer {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java
index 289b41c503..9ae45f7a26 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java
@@ -29,7 +29,7 @@ import org.springframework.rabbit.stream.support.converter.StreamMessageConverte
  * auto-configuration.
  *
  * @author Eddú Meléndez
- * @since 2.7.0
+ * @since 4.0.0
  */
 public class RabbitStreamTemplateConfigurer {
 
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java
index 57ac690aa9..615dc27b2d 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java
@@ -38,7 +38,7 @@ import org.springframework.util.CollectionUtils;
  *
  * @author Stephane Nicoll
  * @author Yanming Zhou
- * @since 2.3.0
+ * @since 4.0.0
  */
 public class RabbitTemplateConfigurer {
 
@@ -51,7 +51,6 @@ public class RabbitTemplateConfigurer {
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use
-	 * @since 2.6.0
 	 */
 	public RabbitTemplateConfigurer(RabbitProperties rabbitProperties) {
 		Assert.notNull(rabbitProperties, "'rabbitProperties' must not be null");
@@ -62,7 +61,6 @@ public class RabbitTemplateConfigurer {
 	 * Set the {@link MessageConverter} to use or {@code null} if the out-of-the-box
 	 * converter should be used.
 	 * @param messageConverter the {@link MessageConverter}
-	 * @since 2.6.0
 	 */
 	public void setMessageConverter(MessageConverter messageConverter) {
 		this.messageConverter = messageConverter;
@@ -71,7 +69,6 @@ public class RabbitTemplateConfigurer {
 	/**
 	 * Set the {@link RabbitRetryTemplateCustomizer} instances to use.
 	 * @param retryTemplateCustomizers the retry template customizers
-	 * @since 2.6.0
 	 */
 	public void setRetryTemplateCustomizers(List<RabbitRetryTemplateCustomizer> retryTemplateCustomizers) {
 		this.retryTemplateCustomizers = retryTemplateCustomizers;
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java
index 0b14da4fe0..c380283e17 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java
@@ -22,7 +22,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
  * Callback interface that can be used to customize a {@link RabbitTemplate}.
  *
  * @author dang zhicairang
- * @since 3.1.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface RabbitTemplateCustomizer {
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java
index 066f624240..e4e9772460 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java
@@ -30,7 +30,7 @@ import org.springframework.boot.context.properties.PropertyMapper;
  *
  * @author Stephane Nicoll
  * @author Gary Russell
- * @since 1.3.3
+ * @since 4.0.0
  */
 public final class SimpleRabbitListenerContainerFactoryConfigurer
 		extends AbstractRabbitListenerContainerFactoryConfigurer<SimpleRabbitListenerContainerFactory> {
@@ -38,7 +38,6 @@ public final class SimpleRabbitListenerContainerFactoryConfigurer
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use
-	 * @since 2.6.0
 	 */
 	public SimpleRabbitListenerContainerFactoryConfigurer(RabbitProperties rabbitProperties) {
 		super(rabbitProperties);
diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java
index a3ef9a9263..a9324c0637 100644
--- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean;
  * {@link ConnectionFactory connection factories}.
  *
  * @author Stephane Nicoll
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(afterName = "org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration",
 		after = RabbitAutoConfiguration.class)
diff --git a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisAutoConfiguration.java b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisAutoConfiguration.java
index ad9a7efc25..f24f5e6f6d 100644
--- a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisAutoConfiguration.java
@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Import;
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
- * @since 1.3.0
+ * @since 4.0.0
  * @see ArtemisProperties
  */
 @AutoConfiguration(before = JmsAutoConfiguration.class,
diff --git a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java
index 032b5282ac..2ec0081260 100644
--- a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java
+++ b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
  *
  * @author Eddú Meléndez
  * @author Phillip Webb
- * @since 1.3.0
+ * @since 4.0.0
  * @see ArtemisAutoConfiguration
  */
 @FunctionalInterface
diff --git a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConnectionDetails.java b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConnectionDetails.java
index 156605a88a..6adba675c3 100644
--- a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConnectionDetails.java
+++ b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConnectionDetails.java
@@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.service.connection.ConnectionDetai
  * Details required to establish a connection to an Artemis service.
  *
  * @author Eddú Meléndez
- * @since 3.3.0
+ * @since 4.0.0
  */
 public interface ArtemisConnectionDetails extends ConnectionDetails {
 
diff --git a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisMode.java b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisMode.java
index 4d3a8da31b..4cba002287 100644
--- a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisMode.java
+++ b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisMode.java
@@ -21,7 +21,7 @@ package org.springframework.boot.artemis.autoconfigure;
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
- * @since 1.3.0
+ * @since 4.0.0
  */
 public enum ArtemisMode {
 
diff --git a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisNoOpBindingRegistry.java b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisNoOpBindingRegistry.java
index 4773be288c..8feb18eea3 100644
--- a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisNoOpBindingRegistry.java
+++ b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisNoOpBindingRegistry.java
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.spi.core.naming.BindingRegistry;
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
- * @since 1.3.0
+ * @since 4.0.0
  */
 public class ArtemisNoOpBindingRegistry implements BindingRegistry {
 
diff --git a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisProperties.java b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisProperties.java
index 05f6ea5753..fc6a70135a 100644
--- a/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisProperties.java
+++ b/spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisProperties.java
@@ -33,7 +33,7 @@ import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryProper
  * @author Eddú Meléndez
  * @author Stephane Nicoll
  * @author Justin Bertram
- * @since 1.3.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.artemis")
 public class ArtemisProperties {
diff --git a/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraConnectionDetails.java b/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraConnectionDetails.java
index 40862f2a77..a40412ec78 100644
--- a/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraConnectionDetails.java
+++ b/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraConnectionDetails.java
@@ -63,7 +63,6 @@ public interface CassandraConnectionDetails extends ConnectionDetails {
 	/**
 	 * SSL bundle to use.
 	 * @return the SSL bundle to use
-	 * @since 3.5.0
 	 */
 	default SslBundle getSslBundle() {
 		return null;
diff --git a/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraHealthContributorAutoConfiguration.java
index a5f547e996..10cd6c940d 100644
--- a/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraHealthContributorAutoConfiguration.java
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Import;
  *
  * @author Julien Dubois
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(
 		after = { CassandraReactiveHealthContributorAutoConfiguration.class, CassandraAutoConfiguration.class })
diff --git a/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraReactiveHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraReactiveHealthContributorAutoConfiguration.java
index 850206f6bd..39a2a25de7 100644
--- a/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraReactiveHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/health/CassandraReactiveHealthContributorAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Import;
  *
  * @author Artsiom Yudovin
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = CassandraAutoConfiguration.class)
 @ConditionalOnClass({ CqlSession.class, Flux.class, CassandraDriverReactiveHealthIndicator.class,
diff --git a/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseConnectionDetails.java b/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseConnectionDetails.java
index c01a24af3a..fec8dafe70 100644
--- a/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseConnectionDetails.java
+++ b/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseConnectionDetails.java
@@ -50,7 +50,6 @@ public interface CouchbaseConnectionDetails extends ConnectionDetails {
 	/**
 	 * SSL bundle to use.
 	 * @return the SSL bundle to use
-	 * @since 3.5.0
 	 */
 	default SslBundle getSslBundle() {
 		return null;
diff --git a/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/health/CouchbaseHealthIndicator.java b/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/health/CouchbaseHealthIndicator.java
index fad2d971c3..807b8f5f0b 100644
--- a/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/health/CouchbaseHealthIndicator.java
+++ b/spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/health/CouchbaseHealthIndicator.java
@@ -38,7 +38,6 @@ public class CouchbaseHealthIndicator extends AbstractHealthIndicator {
 	/**
 	 * Create an indicator with the specified {@link Cluster}.
 	 * @param cluster the Couchbase Cluster
-	 * @since 2.0.6
 	 */
 	public CouchbaseHealthIndicator(Cluster cluster) {
 		super("Couchbase health check failed");
diff --git a/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java b/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java
index 62dfc91678..f58f5b8cc3 100644
--- a/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java
+++ b/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java
@@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for Spring Data JDBC.
  *
  * @author Jens Schauder
- * @since 3.3.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.data.jdbc")
 public class JdbcDataProperties {
diff --git a/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDatabaseDialect.java b/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDatabaseDialect.java
index 14fb99526a..9d2e2f4983 100644
--- a/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDatabaseDialect.java
+++ b/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDatabaseDialect.java
@@ -29,7 +29,7 @@ import org.springframework.data.relational.core.dialect.Dialect;
  * List of database dialects that can be configured in Boot for use with Spring Data JDBC.
  *
  * @author Jens Schauder
- * @since 3.3.0
+ * @since 4.0.0
  */
 public enum JdbcDatabaseDialect {
 
diff --git a/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java
index f814d4334f..6dd66ff0b6 100644
--- a/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java
@@ -61,7 +61,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * @author Stephane Nicoll
  * @author Mark Paluch
  * @author Jens Schauder
- * @since 2.1.0
+ * @since 4.0.0
  * @see EnableJdbcRepositories
  */
 @AutoConfiguration(after = { JdbcTemplateAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class })
diff --git a/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoHealthIndicator.java b/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoHealthIndicator.java
index 5c47182a2c..9d2c9b70cf 100644
--- a/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoHealthIndicator.java
+++ b/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoHealthIndicator.java
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  * Mongo data stores.
  *
  * @author Christian Dupuis
- * @since 2.0.0
+ * @since 4.0.0
  */
 public class MongoHealthIndicator extends AbstractHealthIndicator {
 
diff --git a/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoReactiveHealthIndicator.java b/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoReactiveHealthIndicator.java
index 15b9ab6584..22358f132d 100644
--- a/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoReactiveHealthIndicator.java
+++ b/spring-boot-project/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/health/MongoReactiveHealthIndicator.java
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  * A {@link ReactiveHealthIndicator} for Mongo.
  *
  * @author Yulin Qin
- * @since 2.0.0
+ * @since 4.0.0
  */
 public class MongoReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
 
diff --git a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java
index 4cff81354f..8fe3e176ec 100644
--- a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java
@@ -57,7 +57,7 @@ import org.springframework.transaction.TransactionManager;
  * @author Stephane Nicoll
  * @author Kazuki Shimizu
  * @author Michael J. Simons
- * @since 1.4.0
+ * @since 4.0.0
  */
 @AutoConfiguration(before = TransactionAutoConfiguration.class,
 		after = { Neo4jAutoConfiguration.class, TransactionManagerCustomizationAutoConfiguration.class })
diff --git a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java
index ecd3a621d1..c656681592 100644
--- a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java
+++ b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java
@@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for Spring Data Neo4j.
  *
  * @author Michael J. Simons
- * @since 2.4.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.data.neo4j")
 public class Neo4jDataProperties {
diff --git a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java
index b77f4946da..14a49c1a43 100644
--- a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java
@@ -40,7 +40,7 @@ import org.springframework.transaction.ReactiveTransactionManager;
  *
  * @author Michael J. Simons
  * @author Stephane Nicoll
- * @since 2.4.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = Neo4jDataAutoConfiguration.class)
 @ConditionalOnClass({ Driver.class, ReactiveNeo4jTemplate.class, ReactiveTransactionManager.class, Flux.class })
diff --git a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfiguration.java
index 0d23259d5f..c87f4b1d1e 100644
--- a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfiguration.java
@@ -36,7 +36,7 @@ import org.springframework.data.neo4j.repository.support.ReactiveNeo4jRepository
  *
  * @author Michael J. Simons
  * @author Stephane Nicoll
- * @since 2.4.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = Neo4jReactiveDataAutoConfiguration.class)
 @ConditionalOnClass({ Driver.class, ReactiveNeo4jRepository.class, Flux.class })
diff --git a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfiguration.java
index 3b5ed08824..e0573dd502 100644
--- a/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfiguration.java
@@ -46,7 +46,7 @@ import org.springframework.data.neo4j.repository.support.Neo4jRepositoryFactoryB
  * @author Oliver Gierke
  * @author Josh Long
  * @author Michael J. Simons
- * @since 1.4.0
+ * @since 4.0.0
  * @see EnableNeo4jRepositories
  */
 @AutoConfiguration(after = Neo4jDataAutoConfiguration.class)
diff --git a/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionDetails.java b/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionDetails.java
index 9aa164b7cb..f5573b755c 100644
--- a/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionDetails.java
+++ b/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionDetails.java
@@ -102,7 +102,6 @@ public interface RedisConnectionDetails extends ConnectionDetails {
 		/**
 		 * SSL bundle to use.
 		 * @return the SSL bundle to use
-		 * @since 3.5.0
 		 */
 		default SslBundle getSslBundle() {
 			return null;
@@ -124,7 +123,6 @@ public interface RedisConnectionDetails extends ConnectionDetails {
 		 * @param port the port
 		 * @param sslBundle the SSL bundle
 		 * @return the new instance
-		 * @since 3.5.0
 		 */
 		static Standalone of(String host, int port, SslBundle sslBundle) {
 			return of(host, port, 0, sslBundle);
@@ -148,7 +146,6 @@ public interface RedisConnectionDetails extends ConnectionDetails {
 		 * @param database the database
 		 * @param sslBundle the SSL bundle
 		 * @return the new instance
-		 * @since 3.5.0
 		 */
 		static Standalone of(String host, int port, int database, SslBundle sslBundle) {
 			Assert.hasLength(host, "'host' must not be empty");
@@ -216,7 +213,6 @@ public interface RedisConnectionDetails extends ConnectionDetails {
 		/**
 		 * SSL bundle to use.
 		 * @return the SSL bundle to use
-		 * @since 3.5.0
 		 */
 		default SslBundle getSslBundle() {
 			return null;
@@ -239,7 +235,6 @@ public interface RedisConnectionDetails extends ConnectionDetails {
 		/**
 		 * SSL bundle to use.
 		 * @return the SSL bundle to use
-		 * @since 3.5.0
 		 */
 		default SslBundle getSslBundle() {
 			return null;
diff --git a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfiguration.java b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfiguration.java
index 98d35bc226..5f546645ac 100644
--- a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Import;
  * {@link EnableAutoConfiguration Auto-configuration} for Elasticsearch's Java client.
  *
  * @author Andy Wilkinson
- * @since 3.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = { ElasticsearchRestClientAutoConfiguration.class },
 		afterName = { "org.springframework.boot.jsonb.autoconfigure.JsonbAutoConfiguration" })
diff --git a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java
index 34bda03a2b..4f9c65a2ea 100644
--- a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java
+++ b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java
@@ -29,7 +29,7 @@ import org.springframework.boot.ssl.SslBundle;
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.1.0
+ * @since 4.0.0
  */
 public interface ElasticsearchConnectionDetails extends ConnectionDetails {
 
@@ -67,7 +67,6 @@ public interface ElasticsearchConnectionDetails extends ConnectionDetails {
 	/**
 	 * SSL bundle to use.
 	 * @return the SSL bundle to use
-	 * @since 3.5.0
 	 */
 	default SslBundle getSslBundle() {
 		return null;
diff --git a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchProperties.java b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchProperties.java
index 6abe99b801..a8b1b8879a 100644
--- a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchProperties.java
+++ b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchProperties.java
@@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for Elasticsearch.
  *
  * @author Andy Wilkinson
- * @since 2.4.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.elasticsearch")
 public class ElasticsearchProperties {
diff --git a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchReactiveClientAutoConfiguration.java b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchReactiveClientAutoConfiguration.java
index e1cc7305ad..5959768c15 100644
--- a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchReactiveClientAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchReactiveClientAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchCl
  * reactive client.
  *
  * @author Brian Clozel
- * @since 3.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = ElasticsearchClientAutoConfiguration.class)
 @ConditionalOnBean(RestClient.class)
diff --git a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfiguration.java b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfiguration.java
index 9c500fdf7a..87d1e4c136 100644
--- a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfiguration.java
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Import;
  *
  * @author Brian Clozel
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = SslAutoConfiguration.class)
 @ConditionalOnClass(RestClientBuilder.class)
diff --git a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/RestClientBuilderCustomizer.java b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/RestClientBuilderCustomizer.java
index b2454841ed..31987635bd 100644
--- a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/RestClientBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/RestClientBuilderCustomizer.java
@@ -28,7 +28,7 @@ import org.elasticsearch.client.RestClientBuilder;
  *
  * @author Brian Clozel
  * @author Vedran Pavic
- * @since 2.1.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface RestClientBuilderCustomizer {
@@ -47,7 +47,6 @@ public interface RestClientBuilderCustomizer {
 	/**
 	 * Customize the {@link HttpAsyncClientBuilder}.
 	 * @param builder the builder
-	 * @since 2.3.0
 	 */
 	default void customize(HttpAsyncClientBuilder builder) {
 	}
@@ -55,7 +54,6 @@ public interface RestClientBuilderCustomizer {
 	/**
 	 * Customize the {@link Builder}.
 	 * @param builder the builder
-	 * @since 2.3.0
 	 */
 	default void customize(Builder builder) {
 	}
diff --git a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/health/ElasticsearchRestHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/health/ElasticsearchRestHealthContributorAutoConfiguration.java
index ebe0d59820..49a2263356 100644
--- a/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/health/ElasticsearchRestHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/health/ElasticsearchRestHealthContributorAutoConfiguration.java
@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Bean;
  * {@link ElasticsearchRestClientHealthIndicator}.
  *
  * @author Artsiom Yudovin
- * @since 2.1.1
+ * @since 4.0.0
  */
 @AutoConfiguration(after = ElasticsearchRestClientAutoConfiguration.class)
 @ConditionalOnClass({ RestClient.class, ConditionalOnEnabledHealthIndicator.class })
diff --git a/spring-boot-project/spring-boot-health/src/main/java/org/springframework/boot/health/AbstractReactiveHealthIndicator.java b/spring-boot-project/spring-boot-health/src/main/java/org/springframework/boot/health/AbstractReactiveHealthIndicator.java
index d281c5de34..ffe8e95187 100644
--- a/spring-boot-project/spring-boot-health/src/main/java/org/springframework/boot/health/AbstractReactiveHealthIndicator.java
+++ b/spring-boot-project/spring-boot-health/src/main/java/org/springframework/boot/health/AbstractReactiveHealthIndicator.java
@@ -47,7 +47,6 @@ public abstract class AbstractReactiveHealthIndicator implements ReactiveHealthI
 	/**
 	 * Create a new {@link AbstractReactiveHealthIndicator} instance with a default
 	 * {@code healthCheckFailedMessage}.
-	 * @since 2.1.7
 	 */
 	protected AbstractReactiveHealthIndicator() {
 		this(NO_MESSAGE);
@@ -57,7 +56,6 @@ public abstract class AbstractReactiveHealthIndicator implements ReactiveHealthI
 	 * Create a new {@link AbstractReactiveHealthIndicator} instance with a specific
 	 * message to log when the health check fails.
 	 * @param healthCheckFailedMessage the message to log on health check failure
-	 * @since 2.1.7
 	 */
 	protected AbstractReactiveHealthIndicator(String healthCheckFailedMessage) {
 		this.healthCheckFailedMessage = (ex) -> healthCheckFailedMessage;
diff --git a/spring-boot-project/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java
index dc2a9a2d9d..01f21641ea 100644
--- a/spring-boot-project/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Rui Figueira
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = HibernateJpaAutoConfiguration.class,
 		afterName = "org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration")
diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/DataSourcePoolMetadataProvidersConfiguration.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/DataSourcePoolMetadataProvidersConfiguration.java
index 7747888dcf..70b18a706b 100644
--- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/DataSourcePoolMetadataProvidersConfiguration.java
+++ b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/DataSourcePoolMetadataProvidersConfiguration.java
@@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Stephane Nicoll
  * @author Fabio Grassi
- * @since 1.2.0
+ * @since 4.0.0
  */
 @Configuration(proxyBeanMethods = false)
 public class DataSourcePoolMetadataProvidersConfiguration {
diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcConnectionDetails.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcConnectionDetails.java
index edfe631fe7..0118849574 100644
--- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcConnectionDetails.java
+++ b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcConnectionDetails.java
@@ -25,7 +25,7 @@ import org.springframework.boot.jdbc.DatabaseDriver;
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.1.0
+ * @since 4.0.0
  */
 public interface JdbcConnectionDetails extends ConnectionDetails {
 
diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcProperties.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcProperties.java
index 48a3341969..b0989e2e13 100644
--- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcProperties.java
+++ b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcProperties.java
@@ -27,7 +27,7 @@ import org.springframework.boot.convert.DurationUnit;
  *
  * @author Kazuki Shimizu
  * @author Stephane Nicoll
- * @since 2.0.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.jdbc")
 public class JdbcProperties {
diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcTemplateAutoConfiguration.java
index a73ac67404..19c236fab7 100644
--- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcTemplateAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/JdbcTemplateAutoConfiguration.java
@@ -36,7 +36,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
  * @author Phillip Webb
  * @author Stephane Nicoll
  * @author Kazuki Shimizu
- * @since 1.4.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = DataSourceAutoConfiguration.class)
 @ConditionalOnClass({ DataSource.class, JdbcTemplate.class })
diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/docker/compose/JdbcUrlBuilder.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/docker/compose/JdbcUrlBuilder.java
index f19e650f6e..1592b87386 100644
--- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/docker/compose/JdbcUrlBuilder.java
+++ b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/docker/compose/JdbcUrlBuilder.java
@@ -86,7 +86,6 @@ class JdbcUrlBuilder {
 	 * The default implementation appends a {@code ?} followed by the {@code parameters}.
 	 * @param url the url
 	 * @param parameters the parameters
-	 * @since 3.2.7
 	 */
 	protected void appendParameters(StringBuilder url, String parameters) {
 		url.append("?").append(parameters);
diff --git a/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/actuate/endpoint/web/JerseyEndpointResourceFactory.java b/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/actuate/endpoint/web/JerseyEndpointResourceFactory.java
index cfb716b57e..d0a2cf3f22 100644
--- a/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/actuate/endpoint/web/JerseyEndpointResourceFactory.java
+++ b/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/actuate/endpoint/web/JerseyEndpointResourceFactory.java
@@ -67,7 +67,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 2.0.0
+ * @since 4.0.0
  */
 public class JerseyEndpointResourceFactory {
 
diff --git a/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseyChildManagementContextConfiguration.java b/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseyChildManagementContextConfiguration.java
index ded06124fd..bb40726901 100644
--- a/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseyChildManagementContextConfiguration.java
+++ b/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseyChildManagementContextConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Import;
  * different port is required.
  *
  * @author Madhura Bhave
- * @since 2.1.0
+ * @since 4.0.0
  */
 @ManagementContextConfiguration(value = ManagementContextType.CHILD, proxyBeanMethods = false)
 @Import(JerseyManagementContextConfiguration.class)
diff --git a/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseySameManagementContextConfiguration.java b/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseySameManagementContextConfiguration.java
index 1a4274728a..89f7700dd0 100644
--- a/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseySameManagementContextConfiguration.java
+++ b/spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseySameManagementContextConfiguration.java
@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Import;
  * infrastructure when the management context is the same as the main application context.
  *
  * @author Madhura Bhave
- * @since 2.1.0
+ * @since 4.0.0
  */
 @ManagementContextConfiguration(value = ManagementContextType.SAME, proxyBeanMethods = false)
 @EnableConfigurationProperties(JerseyProperties.class)
diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java
index c780321191..d9c0467486 100644
--- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java
+++ b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java
@@ -48,7 +48,7 @@ import org.springframework.util.unit.DataSize;
  * @author Florian Storz
  * @author Michael Weidmann
  * @author Lasse Wulff
- * @since 3.5.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("server.jetty")
 public class JettyServerProperties {
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java
index 1c4f196d02..b9a38c232f 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java
@@ -26,7 +26,7 @@ import org.springframework.jms.connection.CachingConnectionFactory;
  * pooling.
  *
  * @author Stephane Nicoll
- * @since 3.4.0
+ * @since 4.0.0
  */
 public final class ConnectionFactoryUnwrapper {
 
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/AcknowledgeMode.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/AcknowledgeMode.java
index 89dbd97e09..bf1c6758f5 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/AcknowledgeMode.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/AcknowledgeMode.java
@@ -32,7 +32,7 @@ import org.springframework.jms.support.JmsAccessor;
  * handled through a call to {@link JmsAccessor#setSessionTransacted(boolean)}.
  *
  * @author Andy Wilkinson
- * @since 3.2.0
+ * @since 4.0.0
  */
 public final class AcknowledgeMode {
 
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/DefaultJmsListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/DefaultJmsListenerContainerFactoryConfigurer.java
index 21d1fcb99f..10bb1bde21 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/DefaultJmsListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/DefaultJmsListenerContainerFactoryConfigurer.java
@@ -42,7 +42,7 @@ import org.springframework.util.Assert;
  * @author Eddú Meléndez
  * @author Vedran Pavic
  * @author Lasse Wulff
- * @since 1.3.3
+ * @since 4.0.0
  */
 public final class DefaultJmsListenerContainerFactoryConfigurer {
 
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsAutoConfiguration.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsAutoConfiguration.java
index 4f72881be1..7a9c56a4e2 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsAutoConfiguration.java
@@ -56,7 +56,7 @@ import org.springframework.jms.support.destination.DestinationResolver;
  * @author Greg Turnquist
  * @author Stephane Nicoll
  * @author Vedran Pavic
- * @since 1.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass({ Message.class, JmsTemplate.class })
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryFactory.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryFactory.java
index 3aa695f4fc..4057624738 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryFactory.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryFactory.java
@@ -24,7 +24,7 @@ import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
  * {@link JmsPoolConnectionFactoryProperties}.
  *
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
 public class JmsPoolConnectionFactoryFactory {
 
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryProperties.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryProperties.java
index 38cacb1fe1..8ff000d718 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryProperties.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsPoolConnectionFactoryProperties.java
@@ -22,7 +22,7 @@ import java.time.Duration;
  * Configuration properties for connection factory pooling.
  *
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
 public class JmsPoolConnectionFactoryProperties {
 
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsProperties.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsProperties.java
index b74dcc64c4..4c718c3ff1 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsProperties.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsProperties.java
@@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Stephane Nicoll
  * @author Lasse Wulff
  * @author Vedran Pavic
- * @since 1.0.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.jms")
 public class JmsProperties {
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JndiConnectionFactoryAutoConfiguration.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JndiConnectionFactoryAutoConfiguration.java
index fc432377e1..8fbdeed2c9 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JndiConnectionFactoryAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JndiConnectionFactoryAutoConfiguration.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  * {@link EnableAutoConfiguration Auto-configuration} for JMS provided from JNDI.
  *
  * @author Phillip Webb
- * @since 1.2.0
+ * @since 4.0.0
  */
 @AutoConfiguration(before = JmsAutoConfiguration.class)
 @ConditionalOnClass(JmsTemplate.class)
diff --git a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/health/JmsHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/health/JmsHealthContributorAutoConfiguration.java
index a27428bd18..4bc1d7c541 100644
--- a/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/health/JmsHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/health/JmsHealthContributorAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean;
  * {@link EnableAutoConfiguration Auto-configuration} for {@link JmsHealthIndicator}.
  *
  * @author Stephane Nicoll
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = JmsAutoConfiguration.class)
 @ConditionalOnClass({ ConnectionFactory.class, JmsHealthIndicator.class })
diff --git a/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/JpaBaseConfiguration.java b/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/JpaBaseConfiguration.java
index 28e181647a..64cb958e76 100644
--- a/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/JpaBaseConfiguration.java
+++ b/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/JpaBaseConfiguration.java
@@ -152,7 +152,6 @@ public abstract class JpaBaseConfiguration {
 	 * Return the vendor-specific properties for the given {@link DataSource}.
 	 * @param dataSource the data source
 	 * @return the vendor properties
-	 * @since 3.4.4
 	 */
 	protected abstract Map<String, Object> getVendorProperties(DataSource dataSource);
 
diff --git a/spring-boot-project/spring-boot-jsonb/src/main/java/org/springframework/boot/jsonb/autoconfigure/JsonbAutoConfiguration.java b/spring-boot-project/spring-boot-jsonb/src/main/java/org/springframework/boot/jsonb/autoconfigure/JsonbAutoConfiguration.java
index b9001e4046..c934a6df9f 100644
--- a/spring-boot-project/spring-boot-jsonb/src/main/java/org/springframework/boot/jsonb/autoconfigure/JsonbAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-jsonb/src/main/java/org/springframework/boot/jsonb/autoconfigure/JsonbAutoConfiguration.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean;
  * {@link EnableAutoConfiguration Auto-configuration} for JSON-B.
  *
  * @author Eddú Meléndez
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass(Jsonb.class)
diff --git a/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java
index a71e3685d4..6cd62a8b61 100644
--- a/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java
@@ -43,7 +43,7 @@ import org.springframework.kafka.streams.KafkaStreamsMicrometerListener;
  * @author Andy Wilkinson
  * @author Stephane Nicoll
  * @author Eddú Meléndez
- * @since 2.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(before = KafkaAutoConfiguration.class,
 		afterName = { "org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration",
diff --git a/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/LdapProperties.java b/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/LdapProperties.java
index 9764d2b3fe..968041e445 100644
--- a/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/LdapProperties.java
+++ b/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/LdapProperties.java
@@ -199,8 +199,6 @@ public class LdapProperties {
 
 	/**
 	 * Define the methods to handle referrals.
-	 *
-	 * @since 3.5.0
 	 */
 	public enum Referral {
 
diff --git a/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/health/LdapHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/health/LdapHealthContributorAutoConfiguration.java
index 705c7fd97f..d5642aa982 100644
--- a/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/health/LdapHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/health/LdapHealthContributorAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.ldap.core.LdapOperations;
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = LdapAutoConfiguration.class)
 @ConditionalOnClass({ LdapOperations.class, LdapHealthIndicator.class, ConditionalOnEnabledHealthIndicator.class })
diff --git a/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailProperties.java b/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailProperties.java
index f40366b386..8eb40f35f3 100644
--- a/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailProperties.java
+++ b/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailProperties.java
@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Oliver Gierke
  * @author Stephane Nicoll
  * @author Eddú Meléndez
- * @since 1.2.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.mail")
 public class MailProperties {
diff --git a/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfiguration.java b/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfiguration.java
index 2b71e8a31f..ec4ee3b39c 100644
--- a/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfiguration.java
@@ -37,7 +37,7 @@ import org.springframework.mail.MailSender;
  * @author Oliver Gierke
  * @author Stephane Nicoll
  * @author Eddú Meléndez
- * @since 1.2.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass({ MimeMessage.class, MimeType.class, MailSender.class })
diff --git a/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderValidatorAutoConfiguration.java b/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderValidatorAutoConfiguration.java
index ff11ef05e7..66b6682343 100644
--- a/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderValidatorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderValidatorAutoConfiguration.java
@@ -30,7 +30,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl;
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
- * @since 1.3.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = MailSenderAutoConfiguration.class)
 @ConditionalOnBooleanProperty("spring.mail.test-connection")
diff --git a/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoConnectionDetails.java b/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoConnectionDetails.java
index e9390d1205..43457b49ce 100644
--- a/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoConnectionDetails.java
+++ b/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoConnectionDetails.java
@@ -40,7 +40,6 @@ public interface MongoConnectionDetails extends ConnectionDetails {
 	/**
 	 * SSL bundle to use.
 	 * @return the SSL bundle to use
-	 * @since 3.5.0
 	 */
 	default SslBundle getSslBundle() {
 		return null;
diff --git a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java
index 27e9eb2b62..43c09ac37a 100644
--- a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java
@@ -25,7 +25,7 @@ import org.neo4j.driver.Config.ConfigBuilder;
  * auto-configuration.
  *
  * @author Stephane Nicoll
- * @since 2.4.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface ConfigBuilderCustomizer {
diff --git a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfiguration.java b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfiguration.java
index 88430ec578..e7d2e798e4 100644
--- a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfiguration.java
@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 2.4.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass(Driver.class)
diff --git a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jConnectionDetails.java b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jConnectionDetails.java
index f4d6e25cb2..3525650037 100644
--- a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jConnectionDetails.java
+++ b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jConnectionDetails.java
@@ -30,7 +30,7 @@ import org.springframework.boot.autoconfigure.service.connection.ConnectionDetai
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.1.0
+ * @since 4.0.0
  */
 public interface Neo4jConnectionDetails extends ConnectionDetails {
 
@@ -54,7 +54,6 @@ public interface Neo4jConnectionDetails extends ConnectionDetails {
 	 * Returns the {@link AuthTokenManager} to use for authentication. Defaults to
 	 * {@code null} in which case the {@link #getAuthToken() auth token} should be used.
 	 * @return the auth token manager
-	 * @since 3.2.0
 	 */
 	default AuthTokenManager getAuthTokenManager() {
 		return null;
diff --git a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jProperties.java b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jProperties.java
index 0da6225890..f390534efa 100644
--- a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jProperties.java
+++ b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/Neo4jProperties.java
@@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  *
  * @author Michael J. Simons
  * @author Stephane Nicoll
- * @since 2.4.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.neo4j")
 public class Neo4jProperties {
diff --git a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/health/Neo4jHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/health/Neo4jHealthContributorAutoConfiguration.java
index 4cc201b3a6..9346a47861 100644
--- a/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/health/Neo4jHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/health/Neo4jHealthContributorAutoConfiguration.java
@@ -37,7 +37,7 @@ import org.springframework.context.annotation.Import;
  * @author Eric Spiegelberg
  * @author Stephane Nicoll
  * @author Michael J. Simons
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = Neo4jAutoConfiguration.class)
 @ConditionalOnClass({ Driver.class, ConditionalOnEnabledHealthIndicator.class })
diff --git a/spring-boot-project/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/OpenTelemetryProperties.java b/spring-boot-project/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/OpenTelemetryProperties.java
index b7bfc651e1..d46525fd30 100644
--- a/spring-boot-project/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/OpenTelemetryProperties.java
+++ b/spring-boot-project/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/OpenTelemetryProperties.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for OpenTelemetry.
  *
  * @author Moritz Halbritter
- * @since 3.2.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("management.opentelemetry")
 public class OpenTelemetryProperties {
diff --git a/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpoint.java b/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpoint.java
index e58f52b1a2..7571b6fc05 100644
--- a/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpoint.java
+++ b/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpoint.java
@@ -218,7 +218,6 @@ public class QuartzEndpoint {
 	 * @return a description of the triggered job or {@code null} if the job does not
 	 * exist
 	 * @throws SchedulerException if there is an error triggering the job
-	 * @since 3.5.0
 	 */
 	public QuartzJobTriggerDescriptor triggerQuartzJob(String groupName, String jobName) throws SchedulerException {
 		return triggerQuartzJob(JobKey.jobKey(jobName, groupName));
@@ -410,8 +409,6 @@ public class QuartzEndpoint {
 
 	/**
 	 * Description of a triggered on-demand {@link Job Quartz Job}.
-	 *
-	 * @since 3.5.0
 	 */
 	public static final class QuartzJobTriggerDescriptor {
 
diff --git a/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtension.java b/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtension.java
index c55bb9fdb8..7bd7975c6d 100644
--- a/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtension.java
+++ b/spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtension.java
@@ -88,7 +88,6 @@ public class QuartzEndpointWebExtension {
 	 * @param state desired state
 	 * @return web endpoint response
 	 * @throws SchedulerException if there is an error triggering the job
-	 * @since 3.5.0
 	 */
 	@WriteOperation
 	public WebEndpointResponse<Object> triggerQuartzJob(@Selector String jobs, @Selector String group,
diff --git a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java
index a365a9503d..98b22c9231 100644
--- a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java
@@ -25,7 +25,7 @@ import io.r2dbc.spi.ConnectionFactoryOptions.Builder;
  * auto-configuration.
  *
  * @author Mark Paluch
- * @since 2.3.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface ConnectionFactoryOptionsBuilderCustomizer {
diff --git a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/observation/R2dbcObservationProperties.java b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/observation/R2dbcObservationProperties.java
index 8946bf0aaa..c59c2faca8 100644
--- a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/observation/R2dbcObservationProperties.java
+++ b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/observation/R2dbcObservationProperties.java
@@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for R2DBC observability.
  *
  * @author Moritz Halbritter
- * @since 3.2.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("management.observations.r2dbc")
 public class R2dbcObservationProperties {
diff --git a/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/NettyServerProperties.java b/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/NettyServerProperties.java
index 86134d1e2a..79109046e1 100644
--- a/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/NettyServerProperties.java
+++ b/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/NettyServerProperties.java
@@ -47,7 +47,7 @@ import org.springframework.util.unit.DataSize;
  * @author Florian Storz
  * @author Michael Weidmann
  * @author Lasse Wulff
- * @since 3.5.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("server.netty")
 public class NettyServerProperties {
diff --git a/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyConfigurations.java b/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyConfigurations.java
index 7297c59f0b..7e38316721 100644
--- a/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyConfigurations.java
+++ b/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyConfigurations.java
@@ -27,7 +27,7 @@ import org.springframework.http.client.ReactorResourceFactory;
  * auto-configuration class.
  *
  * @author Moritz Halbritter
- * @since 2.7.9
+ * @since 4.0.0
  */
 public final class ReactorNettyConfigurations {
 
diff --git a/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyProperties.java b/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyProperties.java
index c0602bf1b1..83f9d4677d 100644
--- a/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyProperties.java
+++ b/spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/ReactorNettyProperties.java
@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for Reactor Netty.
  *
  * @author Moritz Halbritter
- * @since 2.7.9
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.reactor.netty")
 public class ReactorNettyProperties {
diff --git a/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/OAuth2ClientAutoConfiguration.java b/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/OAuth2ClientAutoConfiguration.java
index 623dea8f0d..9e65b25b81 100644
--- a/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/OAuth2ClientAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/OAuth2ClientAutoConfiguration.java
@@ -31,7 +31,7 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio
  *
  * @author Madhura Bhave
  * @author Phillip Webb
- * @since 3.5.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @Conditional(NonReactiveWebApplicationCondition.class)
diff --git a/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java b/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java
index d802491d71..2b06fa80c1 100644
--- a/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java
@@ -42,7 +42,7 @@ import static org.springframework.security.config.Customizer.withDefaults;
  * @author Madhura Bhave
  * @author Phillip Webb
  * @author Andy Wilkinson
- * @since 3.5.0
+ * @since 4.0.0
  */
 @AutoConfiguration(before = { ManagementWebSecurityAutoConfiguration.class, SecurityAutoConfiguration.class },
 		after = OAuth2ClientAutoConfiguration.class)
diff --git a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/StaticResourceLocation.java b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/StaticResourceLocation.java
index bcf1bffd3d..4e533ca576 100644
--- a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/StaticResourceLocation.java
+++ b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/StaticResourceLocation.java
@@ -23,7 +23,7 @@ import java.util.stream.Stream;
  * Common locations for static resources.
  *
  * @author Phillip Webb
- * @since 2.0.0
+ * @since 4.0.0
  */
 public enum StaticResourceLocation {
 
diff --git a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/EndpointRequest.java b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/EndpointRequest.java
index 95c7c974af..02bf126d66 100644
--- a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/EndpointRequest.java
+++ b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/EndpointRequest.java
@@ -59,7 +59,7 @@ import org.springframework.web.server.ServerWebExchange;
  * @author Madhura Bhave
  * @author Phillip Webb
  * @author Chris Bono
- * @since 2.0.0
+ * @since 4.0.0
  */
 public final class EndpointRequest {
 
@@ -131,7 +131,6 @@ public final class EndpointRequest {
 	 * @param webServerNamespace the web server namespace
 	 * @param endpoints the endpoints to include
 	 * @return the configured {@link RequestMatcher}
-	 * @since 3.4.0
 	 */
 	public static AdditionalPathsEndpointServerWebExchangeMatcher toAdditionalPaths(
 			WebServerNamespace webServerNamespace, Class<?>... endpoints) {
@@ -147,7 +146,6 @@ public final class EndpointRequest {
 	 * @param webServerNamespace the web server namespace
 	 * @param endpoints the endpoints to include
 	 * @return the configured {@link RequestMatcher}
-	 * @since 3.4.0
 	 */
 	public static AdditionalPathsEndpointServerWebExchangeMatcher toAdditionalPaths(
 			WebServerNamespace webServerNamespace, String... endpoints) {
@@ -414,7 +412,6 @@ public final class EndpointRequest {
 		 * @param httpMethod the HTTP method to include
 		 * @return a copy of the matcher further restricted to only match requests with
 		 * the specified HTTP method
-		 * @since 3.5.0
 		 */
 		public AdditionalPathsEndpointServerWebExchangeMatcher withHttpMethod(HttpMethod httpMethod) {
 			return new AdditionalPathsEndpointServerWebExchangeMatcher(this.webServerNamespace, this.endpoints,
diff --git a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/ReactiveManagementWebSecurityAutoConfiguration.java b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/ReactiveManagementWebSecurityAutoConfiguration.java
index e492cc84a9..d2956daf47 100644
--- a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/ReactiveManagementWebSecurityAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/reactive/ReactiveManagementWebSecurityAutoConfiguration.java
@@ -49,7 +49,7 @@ import static org.springframework.security.config.Customizer.withDefaults;
  * while securing everything else.
  *
  * @author Madhura Bhave
- * @since 2.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(before = ReactiveSecurityAutoConfiguration.class,
 		after = ReactiveUserDetailsServiceAutoConfiguration.class,
diff --git a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfiguration.java b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfiguration.java
index 7e71b20c36..ed5f688988 100644
--- a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfiguration.java
@@ -45,7 +45,7 @@ import static org.springframework.security.config.Customizer.withDefaults;
  *
  * @author Madhura Bhave
  * @author Hatef Palizgar
- * @since 2.1.0
+ * @since 4.0.0
  */
 @AutoConfiguration(before = SecurityAutoConfiguration.class,
 		afterName = { "org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration",
diff --git a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/RequestMatcherProvider.java b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/RequestMatcherProvider.java
index d640180bdd..c2b4df24f2 100644
--- a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/RequestMatcherProvider.java
+++ b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/RequestMatcherProvider.java
@@ -25,7 +25,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  *
  * @author Madhura Bhave
  * @author Chris Bono
- * @since 3.5.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface RequestMatcherProvider {
diff --git a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/SecurityRequestMatchersManagementContextConfiguration.java b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/SecurityRequestMatchersManagementContextConfiguration.java
index 5461d704f1..bcda7ff9c6 100644
--- a/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/SecurityRequestMatchersManagementContextConfiguration.java
+++ b/spring-boot-project/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/servlet/SecurityRequestMatchersManagementContextConfiguration.java
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.DispatcherServlet;
  * {@link RequestMatcherProvider}.
  *
  * @author Madhura Bhave
- * @since 2.1.8
+ * @since 4.0.0
  */
 @ManagementContextConfiguration(proxyBeanMethods = false)
 @ConditionalOnClass({ RequestMatcher.class })
diff --git a/spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/HttpEncodingAutoConfiguration.java b/spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/HttpEncodingAutoConfiguration.java
index 405c28c8ae..1bbea9fa8d 100644
--- a/spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/HttpEncodingAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/HttpEncodingAutoConfiguration.java
@@ -33,7 +33,7 @@ import org.springframework.web.filter.CharacterEncodingFilter;
  *
  * @author Stephane Nicoll
  * @author Brian Clozel
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @EnableConfigurationProperties(ServletEncodingProperties.class)
diff --git a/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java b/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java
index e539124e46..dd616f24ad 100644
--- a/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java
+++ b/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
  *
  * @author Vedran Pavic
  * @author Moritz Halbritter
- * @since 3.3.0
+ * @since 4.0.0
  */
 @Endpoint(id = "sessions")
 public class ReactiveSessionsEndpoint {
diff --git a/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsDescriptor.java b/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsDescriptor.java
index f66ed148ec..7f70eba968 100644
--- a/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsDescriptor.java
+++ b/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsDescriptor.java
@@ -28,7 +28,7 @@ import org.springframework.session.Session;
  * Description of user's {@link Session sessions}.
  *
  * @author Moritz Halbritter
- * @since 3.3.0
+ * @since 4.0.0
  */
 public final class SessionsDescriptor implements OperationResponseBody {
 
diff --git a/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java b/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java
index 1773cb690e..5cc116f721 100644
--- a/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java
+++ b/spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
  * Servlet stack.
  *
  * @author Vedran Pavic
- * @since 2.0.0
+ * @since 4.0.0
  */
 @Endpoint(id = "sessions")
 public class SessionsEndpoint {
@@ -46,7 +46,6 @@ public class SessionsEndpoint {
 	 * Create a new {@link SessionsEndpoint} instance.
 	 * @param sessionRepository the session repository
 	 * @param indexedSessionRepository the indexed session repository
-	 * @since 3.3.0
 	 */
 	public SessionsEndpoint(SessionRepository<? extends Session> sessionRepository,
 			FindByIndexNameSessionRepository<? extends Session> indexedSessionRepository) {
diff --git a/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/OnDatabaseInitializationCondition.java b/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/OnDatabaseInitializationCondition.java
index d1ab0e342d..ce7aef0a08 100644
--- a/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/OnDatabaseInitializationCondition.java
+++ b/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/OnDatabaseInitializationCondition.java
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
  * be considered.
  *
  * @author Stephane Nicoll
- * @since 2.6.2
+ * @since 4.0.0
  * @see DatabaseInitializationMode
  */
 public abstract class OnDatabaseInitializationCondition extends SpringBootCondition {
diff --git a/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/SqlInitializationProperties.java b/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/SqlInitializationProperties.java
index e06d18a9bc..3fc322d3db 100644
--- a/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/SqlInitializationProperties.java
+++ b/spring-boot-project/spring-boot-sql/src/main/java/org/springframework/boot/sql/autoconfigure/init/SqlInitializationProperties.java
@@ -27,7 +27,7 @@ import org.springframework.boot.sql.init.DatabaseInitializationMode;
  * database.
  *
  * @author Andy Wilkinson
- * @since 2.5.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.sql.init")
 public class SqlInitializationProperties {
diff --git a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/TomcatServerProperties.java b/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/TomcatServerProperties.java
index f3b66b5f83..2462afab55 100644
--- a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/TomcatServerProperties.java
+++ b/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/TomcatServerProperties.java
@@ -54,7 +54,7 @@ import org.springframework.util.unit.DataSize;
  * @author Florian Storz
  * @author Michael Weidmann
  * @author Lasse Wulff
- * @since 3.5.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("server.tomcat")
 public class TomcatServerProperties {
diff --git a/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/ConditionalOnEnabledTracing.java b/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/ConditionalOnEnabledTracing.java
index 6851e5fb40..cc47701629 100644
--- a/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/ConditionalOnEnabledTracing.java
+++ b/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/ConditionalOnEnabledTracing.java
@@ -44,7 +44,6 @@ public @interface ConditionalOnEnabledTracing {
 	/**
 	 * Name of the tracing exporter.
 	 * @return the name of the tracing exporter
-	 * @since 3.4.0
 	 */
 	String value() default "";
 
diff --git a/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/otlp/OtlpTracingConnectionDetails.java b/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/otlp/OtlpTracingConnectionDetails.java
index 338fcae1da..75cff8d4e9 100644
--- a/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/otlp/OtlpTracingConnectionDetails.java
+++ b/spring-boot-project/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/otlp/OtlpTracingConnectionDetails.java
@@ -31,7 +31,6 @@ public interface OtlpTracingConnectionDetails extends ConnectionDetails {
 	 * Address to where tracing will be published.
 	 * @param transport the transport to use
 	 * @return the address to where tracing will be published
-	 * @since 3.4.0
 	 */
 	String getUrl(Transport transport);
 
diff --git a/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/PersistenceExceptionTranslationAutoConfiguration.java b/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/PersistenceExceptionTranslationAutoConfiguration.java
index f3407c7f01..fbcc2738ad 100644
--- a/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/PersistenceExceptionTranslationAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/PersistenceExceptionTranslationAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.dao.annotation.PersistenceExceptionTranslationPostPro
  * @author Andy Wilkinson
  * @author Stephane Nicoll
  * @author Madhura Bhave
- * @since 1.2.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass(PersistenceExceptionTranslationPostProcessor.class)
diff --git a/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizers.java b/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizers.java
index d5c33d5863..4972ef2296 100644
--- a/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizers.java
+++ b/spring-boot-project/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizers.java
@@ -42,7 +42,6 @@ public final class TransactionManagerCustomizers {
 	/**
 	 * Customize the given {@code transactionManager}.
 	 * @param transactionManager the transaction manager to customize
-	 * @since 3.2.0
 	 */
 	@SuppressWarnings("unchecked")
 	public void customize(TransactionManager transactionManager) {
@@ -56,7 +55,6 @@ public final class TransactionManagerCustomizers {
 	 * {@code customizers}.
 	 * @param customizers the customizers
 	 * @return the new instance
-	 * @since 3.2.0
 	 */
 	public static TransactionManagerCustomizers of(Collection<? extends TransactionManagerCustomizer<?>> customizers) {
 		return new TransactionManagerCustomizers(
diff --git a/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/UndertowServerProperties.java b/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/UndertowServerProperties.java
index a7b11de3b5..cf1b34b610 100644
--- a/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/UndertowServerProperties.java
+++ b/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/UndertowServerProperties.java
@@ -54,7 +54,7 @@ import org.springframework.util.unit.DataSize;
  * @author Florian Storz
  * @author Michael Weidmann
  * @author Lasse Wulff
- * @since 3.5.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("server.undertow")
 public class UndertowServerProperties {
diff --git a/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/WebSocketUndertowServletWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/WebSocketUndertowServletWebServerFactoryCustomizer.java
index bda533388c..8d946244ee 100644
--- a/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/WebSocketUndertowServletWebServerFactoryCustomizer.java
+++ b/spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/WebSocketUndertowServletWebServerFactoryCustomizer.java
@@ -28,7 +28,7 @@ import org.springframework.core.Ordered;
  * WebSocket customizer for {@link UndertowServletWebServerFactory}.
  *
  * @author Phillip Webb
- * @since 2.0.0
+ * @since 4.0.0
  */
 public class WebSocketUndertowServletWebServerFactoryCustomizer
 		implements WebServerFactoryCustomizer<UndertowServletWebServerFactory>, Ordered {
diff --git a/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/LocalHostUriTemplateHandler.java b/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/LocalHostUriTemplateHandler.java
index 6178c73283..7c16261902 100644
--- a/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/LocalHostUriTemplateHandler.java
+++ b/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/LocalHostUriTemplateHandler.java
@@ -55,7 +55,6 @@ public class LocalHostUriTemplateHandler extends RootUriTemplateHandler {
 	 * context-path and port.
 	 * @param environment the environment used to determine the port
 	 * @param scheme the scheme of the root uri
-	 * @since 1.4.1
 	 */
 	public LocalHostUriTemplateHandler(Environment environment, String scheme) {
 		this(environment, scheme, new DefaultUriBuilderFactory());
@@ -68,7 +67,6 @@ public class LocalHostUriTemplateHandler extends RootUriTemplateHandler {
 	 * @param environment the environment used to determine the port
 	 * @param scheme the scheme of the root uri
 	 * @param handler the delegate handler
-	 * @since 2.0.3
 	 */
 	public LocalHostUriTemplateHandler(Environment environment, String scheme, UriTemplateHandler handler) {
 		super(handler);
diff --git a/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/TestRestTemplate.java b/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/TestRestTemplate.java
index 983e699cc0..d6ba5c7367 100644
--- a/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/TestRestTemplate.java
+++ b/spring-boot-project/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/TestRestTemplate.java
@@ -98,7 +98,6 @@ public class TestRestTemplate {
 	 * Create a new {@link TestRestTemplate} instance.
 	 * @param restTemplateBuilder builder used to configure underlying
 	 * {@link RestTemplate}
-	 * @since 1.4.1
 	 */
 	public TestRestTemplate(RestTemplateBuilder restTemplateBuilder) {
 		this(restTemplateBuilder, null, null);
@@ -128,7 +127,6 @@ public class TestRestTemplate {
 	 * @param username the username to use (or {@code null})
 	 * @param password the password (or {@code null})
 	 * @param httpClientOptions client options to use if the Apache HTTP Client is used
-	 * @since 2.0.0
 	 */
 	public TestRestTemplate(RestTemplateBuilder builder, String username, String password,
 			HttpClientOption... httpClientOptions) {
@@ -576,7 +574,6 @@ public class TestRestTemplate {
 	 * @param uriVariables the variables to expand the template
 	 * @param <T> the type of the return value
 	 * @return the converted object
-	 * @since 1.4.4
 	 * @see HttpEntity
 	 */
 	public <T> T patchForObject(String url, Object request, Class<T> responseType, Object... uriVariables) {
@@ -597,7 +594,6 @@ public class TestRestTemplate {
 	 * @param uriVariables the variables to expand the template
 	 * @param <T> the type of the return value
 	 * @return the converted object
-	 * @since 1.4.4
 	 * @see HttpEntity
 	 */
 	public <T> T patchForObject(String url, Object request, Class<T> responseType, Map<String, ?> uriVariables) {
@@ -615,7 +611,6 @@ public class TestRestTemplate {
 	 * @param responseType the type of the return value
 	 * @param <T> the type of the return value
 	 * @return the converted object
-	 * @since 1.4.4
 	 * @see HttpEntity
 	 */
 	public <T> T patchForObject(URI url, Object request, Class<T> responseType) {
@@ -949,7 +944,6 @@ public class TestRestTemplate {
 	 * @param username the username
 	 * @param password the password
 	 * @return the new template
-	 * @since 1.4.1
 	 */
 	public TestRestTemplate withBasicAuth(String username, String password) {
 		if (username == null && password == null) {
@@ -966,7 +960,6 @@ public class TestRestTemplate {
 	 * (when possible).
 	 * @param redirects the new redirect settings
 	 * @return the new template
-	 * @since 3.5.0
 	 */
 	public TestRestTemplate withRedirects(HttpRedirects redirects) {
 		return withRequestFactorySettings((settings) -> settings.withRedirects(redirects));
@@ -979,7 +972,6 @@ public class TestRestTemplate {
 	 * request factory type (when possible).
 	 * @param requestFactorySettings the new request factory settings
 	 * @return the new template
-	 * @since 3.4.1
 	 */
 	public TestRestTemplate withRequestFactorySettings(ClientHttpRequestFactorySettings requestFactorySettings) {
 		return new TestRestTemplate(this.builder.requestFactorySettings(requestFactorySettings),
@@ -994,7 +986,6 @@ public class TestRestTemplate {
 	 * @param requestFactorySettingsCustomizer a {@link UnaryOperator} to update the
 	 * settings
 	 * @return the new template
-	 * @since 3.4.1
 	 */
 	public TestRestTemplate withRequestFactorySettings(
 			UnaryOperator<ClientHttpRequestFactorySettings> requestFactorySettingsCustomizer) {
diff --git a/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/exchanges/HttpExchangesWebFilter.java b/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/exchanges/HttpExchangesWebFilter.java
index c5de398c45..b9e10c9812 100644
--- a/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/exchanges/HttpExchangesWebFilter.java
+++ b/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/exchanges/HttpExchangesWebFilter.java
@@ -35,7 +35,7 @@ import org.springframework.web.server.WebSession;
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.0.0
+ * @since 4.0.0
  */
 public class HttpExchangesWebFilter implements WebFilter, Ordered {
 
diff --git a/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/ReactiveMultipartAutoConfiguration.java b/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/ReactiveMultipartAutoConfiguration.java
index 8bac55ce6d..4da7c882bb 100644
--- a/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/ReactiveMultipartAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/ReactiveMultipartAutoConfiguration.java
@@ -41,7 +41,7 @@ import org.springframework.web.reactive.config.WebFluxConfigurer;
  *
  * @author Chris Bono
  * @author Brian Clozel
- * @since 2.6.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass({ DefaultPartHttpMessageReader.class, WebFluxConfigurer.class })
diff --git a/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/actuate/web/WebFluxEndpointManagementContextConfiguration.java b/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/actuate/web/WebFluxEndpointManagementContextConfiguration.java
index bd33efbf9f..39797c79cd 100644
--- a/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/actuate/web/WebFluxEndpointManagementContextConfiguration.java
+++ b/spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/actuate/web/WebFluxEndpointManagementContextConfiguration.java
@@ -78,7 +78,7 @@ import org.springframework.web.reactive.DispatcherHandler;
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 2.0.0
+ * @since 4.0.0
  */
 @ManagementContextConfiguration(proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.REACTIVE)
diff --git a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMapping.java b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMapping.java
index be9d7041fd..86d12a535d 100644
--- a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMapping.java
+++ b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMapping.java
@@ -84,7 +84,7 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMappi
  * @author Madhura Bhave
  * @author Phillip Webb
  * @author Brian Clozel
- * @since 2.0.0
+ * @since 4.0.0
  */
 @ImportRuntimeHints(AbstractWebMvcEndpointHandlerMappingRuntimeHints.class)
 public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappingInfoHandlerMapping
diff --git a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AdditionalHealthEndpointPathsWebMvcHandlerMapping.java b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AdditionalHealthEndpointPathsWebMvcHandlerMapping.java
index 98c7cf4f7c..c85ab4a91c 100644
--- a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AdditionalHealthEndpointPathsWebMvcHandlerMapping.java
+++ b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AdditionalHealthEndpointPathsWebMvcHandlerMapping.java
@@ -33,7 +33,7 @@ import org.springframework.web.servlet.HandlerMapping;
  * path.
  *
  * @author Madhura Bhave
- * @since 2.6.0
+ * @since 4.0.0
  */
 public class AdditionalHealthEndpointPathsWebMvcHandlerMapping extends AbstractWebMvcEndpointHandlerMapping {
 
diff --git a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/ControllerEndpointHandlerMapping.java b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/ControllerEndpointHandlerMapping.java
index 6190993744..aceadfdca3 100644
--- a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/ControllerEndpointHandlerMapping.java
+++ b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/ControllerEndpointHandlerMapping.java
@@ -46,7 +46,7 @@ import org.springframework.web.util.pattern.PathPattern;
  * annotated endpoints over Spring MVC.
  *
  * @author Phillip Webb
- * @since 2.0.0
+ * @since 4.0.0
  * @deprecated since 3.3.5 in favor of {@code @Endpoint} and {@code @WebEndpoint} support
  */
 @Deprecated(since = "3.3.5", forRemoval = true)
diff --git a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/WebMvcEndpointHandlerMapping.java b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/WebMvcEndpointHandlerMapping.java
index 0eaca790ef..4be7c4b6f5 100644
--- a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/WebMvcEndpointHandlerMapping.java
+++ b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/WebMvcEndpointHandlerMapping.java
@@ -46,7 +46,7 @@ import org.springframework.web.servlet.HandlerMapping;
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 2.0.0
+ * @since 4.0.0
  */
 @ImportRuntimeHints(WebMvcEndpointHandlerMappingRuntimeHints.class)
 public class WebMvcEndpointHandlerMapping extends AbstractWebMvcEndpointHandlerMapping {
diff --git a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/WebMvcProperties.java b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/WebMvcProperties.java
index f7d3ad7308..5609df3392 100644
--- a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/WebMvcProperties.java
+++ b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/WebMvcProperties.java
@@ -424,8 +424,6 @@ public class WebMvcProperties {
 
 	/**
 	 * Matching strategy options.
-	 *
-	 * @since 2.4.0
 	 */
 	public enum MatchingStrategy {
 
diff --git a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/ManagementErrorEndpoint.java b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/ManagementErrorEndpoint.java
index 4ee783231e..6d5f3d904d 100644
--- a/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/ManagementErrorEndpoint.java
+++ b/spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/ManagementErrorEndpoint.java
@@ -37,7 +37,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * @author Dave Syer
  * @author Scott Frederick
  * @author Moritz Halbritter
- * @since 2.0.0
+ * @since 4.0.0
  */
 @Controller
 public class ManagementErrorEndpoint {
diff --git a/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesAutoConfiguration.java b/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesAutoConfiguration.java
index 9d459fe84b..d266f0b58a 100644
--- a/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesAutoConfiguration.java
@@ -56,7 +56,7 @@ import org.springframework.xml.xsd.SimpleXsdSchema;
  *
  * @author Vedran Pavic
  * @author Stephane Nicoll
- * @since 1.4.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnWebApplication(type = Type.SERVLET)
diff --git a/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesProperties.java b/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesProperties.java
index d696561d00..6cb65d1e01 100644
--- a/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesProperties.java
+++ b/spring-boot-project/spring-boot-webservices/src/main/java/org/springframework/boot/webservices/autoconfigure/WebServicesProperties.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  *
  * @author Vedran Pavic
  * @author Stephane Nicoll
- * @since 1.4.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.webservices")
 public class WebServicesProperties {
diff --git a/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinConnectionDetails.java b/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinConnectionDetails.java
index 6512056c6f..cc2a995453 100644
--- a/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinConnectionDetails.java
+++ b/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinConnectionDetails.java
@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.service.connection.ConnectionDetai
  * {@link Factory HttpEndpointSupplier.Factory} which defaults to no-op (constant).
  *
  * @author Moritz Halbritter
- * @since 3.1.0
+ * @since 4.0.0
  */
 public interface ZipkinConnectionDetails extends ConnectionDetails {
 
diff --git a/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinHttpClientBuilderCustomizer.java b/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinHttpClientBuilderCustomizer.java
index 5a85669abb..215eb9c09b 100644
--- a/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinHttpClientBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinHttpClientBuilderCustomizer.java
@@ -23,7 +23,7 @@ import java.net.http.HttpClient.Builder;
  * {@link Builder HttpClient.Builder} used to send spans to Zipkin.
  *
  * @author Moritz Halbritter
- * @since 3.3.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface ZipkinHttpClientBuilderCustomizer {
diff --git a/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java b/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java
index d3af25c0f8..54f2cf2b3f 100644
--- a/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java
+++ b/spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java
@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for {@link ZipkinAutoConfiguration}.
  *
  * @author Moritz Halbritter
- * @since 3.0.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("management.zipkin.tracing")
 public class ZipkinProperties {