Merge branch '3.3.x' into 3.4.x

Closes gh-44992

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscoverer.java

@@ -57,7 +57,7 @@ public class CloudFoundryWebEndpointDiscoverer extends WebEndpointDiscoverer {
 	 * @param endpointPathMappers the endpoint path mappers
 	 * @param invokerAdvisors invoker advisors to apply
 	 * @param endpointFilters endpoint filters to apply
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #CloudFoundryWebEndpointDiscoverer(ApplicationContext, ParameterValueMapper, EndpointMediaTypes, List, Collection, Collection, Collection)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java

@@ -37,7 +37,7 @@ public enum EndpointExposure {
 	/**
 	 * Exposed on Cloud Foundry over `/cloudfoundryapplication`.
 	 * @since 2.6.4
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of using
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of using
 	 * {@link EndpointExposure#WEB}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConnectionDetails.java

@@ -30,7 +30,7 @@ public interface OtlpTracingConnectionDetails extends ConnectionDetails {
 	/**
 	 * Address to where tracing will be published.
 	 * @return the address to where tracing will be published
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of {@link #getUrl(Transport)}
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #getUrl(Transport)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)
 	default String getUrl() {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractExposableEndpoint.java

@@ -41,7 +41,7 @@ public abstract class AbstractExposableEndpoint<O extends Operation> implements
 	 * @param id the endpoint id
 	 * @param enabledByDefault if the endpoint is enabled by default
 	 * @param operations the endpoint operations
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #AbstractExposableEndpoint(EndpointId, Access, Collection)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ExposableEndpoint.java

@@ -37,7 +37,7 @@ public interface ExposableEndpoint<O extends Operation> {
 	/**
 	 * Returns if the endpoint is enabled by default.
 	 * @return if the endpoint is enabled by default
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #getDefaultAccess()}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AbstractDiscoveredEndpoint.java

@@ -48,7 +48,7 @@ public abstract class AbstractDiscoveredEndpoint<O extends Operation> extends Ab
 	 * @param id the ID of the endpoint
 	 * @param enabledByDefault if the endpoint is enabled by default
 	 * @param operations the endpoint operations
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #AbstractDiscoveredEndpoint(EndpointDiscoverer, Object, EndpointId, Access, Collection)}
 	 */
 	@SuppressWarnings("removal")

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/Endpoint.java

@@ -66,7 +66,7 @@
 	/**
 	 * If the endpoint should be enabled or disabled by default.
 	 * @return {@code true} if the endpoint is enabled by default
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of {@link #defaultAccess()}
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #defaultAccess()}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)
 	boolean enableByDefault() default true;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java

@@ -90,7 +90,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
 	 * @param parameterValueMapper the parameter value mapper
 	 * @param invokerAdvisors invoker advisors to apply
 	 * @param endpointFilters endpoint filters to apply
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #EndpointDiscoverer(ApplicationContext, ParameterValueMapper, Collection, Collection, Collection)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)
@@ -388,7 +388,7 @@ protected Class<? extends E> getEndpointType() {
 	 * @param enabledByDefault if the endpoint is enabled by default
 	 * @param operations the endpoint operations
 	 * @return a created endpoint (a {@link DiscoveredEndpoint} is recommended)
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #createEndpoint(Object, EndpointId, Access, Collection)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpoint.java

@@ -51,7 +51,7 @@
 	/**
 	 * If the endpoint should be enabled or disabled by default.
 	 * @return {@code true} if the endpoint is enabled by default
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)
 	@AliasFor(annotation = Endpoint.class)

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscoverer.java

@@ -54,7 +54,7 @@ public class JmxEndpointDiscoverer extends EndpointDiscoverer<ExposableJmxEndpoi
 	 * @param parameterValueMapper the parameter value mapper
 	 * @param invokerAdvisors invoker advisors to apply
 	 * @param endpointFilters endpoint filters to apply
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #JmxEndpointDiscoverer(ApplicationContext, ParameterValueMapper, Collection, Collection, Collection)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpoint.java

@@ -51,7 +51,7 @@
 	/**
 	 * If the endpoint should be enabled or disabled by default.
 	 * @return {@code true} if the endpoint is enabled by default
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #defaultAccess()}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)
 	@AliasFor(annotation = Endpoint.class)

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscoverer.java

@@ -67,7 +67,7 @@ public class WebEndpointDiscoverer extends EndpointDiscoverer<ExposableWebEndpoi
 	 * @param endpointPathMappers the endpoint path mappers
 	 * @param invokerAdvisors invoker advisors to apply
 	 * @param filters filters to apply
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #WebEndpointDiscoverer(ApplicationContext, ParameterValueMapper, EndpointMediaTypes, List, List, Collection, Collection, Collection)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java

@@ -101,7 +101,7 @@ void setJmsProperties(JmsProperties jmsProperties) {
 	 * Set the {@link ObservationRegistry} to use.
 	 * @param observationRegistry the {@link ObservationRegistry}
 	 * @since 3.2.1
-	 * @deprecated since 3.3.10 for removal in 3.6.0 as this should have been package
+	 * @deprecated since 3.3.10 for removal in 4.0.0 as this should have been package
 	 * private
 	 */
 	@Deprecated(since = "3.3.10", forRemoval = true)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java

@@ -159,7 +159,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManager
 	/**
 	 * Return the vendor-specific properties.
 	 * @return the vendor properties
-	 * @deprecated since 3.4.4 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.4 for removal in 4.0.0 in favor of
 	 * {@link #getVendorProperties(DataSource)}
 	 */
 	@Deprecated(since = "3.4.4", forRemoval = true)

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessor.java

@@ -29,7 +29,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @since 3.0.0
- * @deprecated in 3.2.11 for removal in 3.6.0
+ * @deprecated in 3.2.11 for removal in 4.0.0
  */
 @Deprecated(since = "3.2.11", forRemoval = true)
 public class ConditionReportApplicationContextFailureProcessor implements ApplicationContextFailureProcessor {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessorTests.java

@@ -35,7 +35,7 @@
  *
  * @author Phillip Webb
  * @author Scott Frederick
- * @deprecated since 3.2.11 for removal in 3.6.0
+ * @deprecated since 3.2.11 for removal in 4.0.0
  */
 @ExtendWith(OutputCaptureExtension.class)
 @Deprecated(since = "3.2.11", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java

@@ -121,7 +121,7 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
 	 * @param contextFactory the factory used to create the actual context
 	 * @param instanceFactory the factory used to create new instance of the runner
 	 * @since 2.6.0
-	 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 	 * {@link #AbstractApplicationContextRunner(Function, Supplier, Class...)}
 	 */
 	@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java

@@ -23,7 +23,7 @@
  *
  * @author Phillip Webb
  * @see DefinitionsParser
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java

@@ -41,7 +41,7 @@
  *
  * @author Phillip Webb
  * @author Stephane Nicoll
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java

@@ -91,7 +91,7 @@
  * @author Phillip Webb
  * @since 1.4.0
  * @see MockitoPostProcessor
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
  * {@link org.springframework.test.context.bean.override.mockito.MockitoBean}
  */
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBeans.java

@@ -33,7 +33,7 @@
  *
  * @author Phillip Webb
  * @since 1.4.0
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
  * {@link org.springframework.test.context.bean.override.mockito.MockitoBean}
  */
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java

@@ -37,7 +37,7 @@
  * A complete definition that can be used to create a Mockito mock.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java

@@ -35,7 +35,7 @@
  * @author Phillip Webb
  * @since 1.4.0
  * @see ResetMocksTestExecutionListener
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
  * {@link org.springframework.test.context.bean.override.mockito.MockReset}
  */
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java

@@ -28,7 +28,7 @@
  * A {@link ContextCustomizer} to add Mockito support.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java

@@ -27,7 +27,7 @@
  * A {@link ContextCustomizerFactory} to add Mockito support.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java

@@ -78,7 +78,7 @@
  * @author Stephane Nicoll
  * @author Andreas Neiser
  * @since 1.4.0
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's
  * {@link MockitoBean} and {@link MockitoSpyBean} support
  */
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java

@@ -48,7 +48,7 @@
  * @author Moritz Halbritter
  * @since 1.4.2
  * @see ResetMocksTestExecutionListener
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's support for
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's support for
  * {@link MockitoBean} and {@link MockitoSpyBean}.
  */
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java

@@ -34,7 +34,7 @@
  * @author Phillip Webb
  * @author Stephane Nicoll
  * @see Definition
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java

@@ -43,7 +43,7 @@
  * @author Phillip Webb
  * @since 1.4.0
  * @see MockitoTestExecutionListener
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
  * {@link org.springframework.test.context.bean.override.mockito.MockitoResetTestExecutionListener}
  */
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java

@@ -31,7 +31,7 @@
  *
  * @author Andy Wilkinson
  * @since 2.4.0
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's
  * {@link MockitoBean} and {@link MockitoSpyBean}
  */
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java

@@ -89,7 +89,7 @@
  * @author Phillip Webb
  * @since 1.4.0
  * @see MockitoPostProcessor
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
  * {@link org.springframework.test.context.bean.override.mockito.MockitoSpyBean}
  */
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBeans.java

@@ -33,7 +33,7 @@
  *
  * @author Phillip Webb
  * @since 1.4.0
- * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+ * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
  * {@link org.springframework.test.context.bean.override.mockito.MockitoSpyBean}
  */
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java

@@ -37,7 +37,7 @@
  * A complete definition that can be used to create a Mockito spy.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/package-info.java

@@ -17,7 +17,7 @@
 /**
  * Mockito integration for Spring Boot tests.
  * <p>
- * Deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's
+ * Deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's
  * {@link org.springframework.test.context.bean.override.mockito.MockitoBean} and
  * {@link org.springframework.test.context.bean.override.mockito.MockitoSpyBean}
  */

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java

@@ -1060,7 +1060,7 @@ protected static class CustomHttpComponentsClientHttpRequestFactory extends Http
 		 * Create a new {@link CustomHttpComponentsClientHttpRequestFactory} instance.
 		 * @param httpClientOptions the {@link HttpClient} options
 		 * @param settings the settings to apply
-		 * @deprecated since 3.4.0 for removal in 3.6.0 in favor of
+		 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
 		 * {@link #CustomHttpComponentsClientHttpRequestFactory(HttpClientOption[], ClientHttpRequestFactorySettings)}
 		 */
 		@Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericExtensionTests.java

@@ -20,7 +20,7 @@
  * Concrete implementation of {@link AbstractMockBeanOnGenericTests}.
  *
  * @author Madhura Bhave
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java

@@ -31,7 +31,7 @@
  * @param <T> type of thing
  * @param <U> type of something
  * @author Madhura Bhave
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java

@@ -36,7 +36,7 @@
  * Tests for {@link DefinitionsParser}.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanContextCachingTests.java

@@ -42,7 +42,7 @@
  * Tests for application context caching when using {@link MockBean @MockBean}.
  *
  * @author Andy Wilkinson
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java

@@ -34,7 +34,7 @@
  * Test {@link MockBean @MockBean} for a factory bean.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForExistingBeanIntegrationTests.java

@@ -35,7 +35,7 @@
  * existing beans.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.4.0", forRemoval = true)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForNewBeanIntegrationTests.java

@@ -34,7 +34,7 @@
  * instances.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @ExtendWith(SpringExtension.class)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForExistingBeanIntegrationTests.java

@@ -35,7 +35,7 @@
  * used to replace existing beans.
  *
  * @author Phillip Webb
- * @deprecated since 3.4.0 for removal in 3.6.0
+ * @deprecated since 3.4.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @ExtendWith(SpringExtension.class)