Merge branch '3.4.x'

Closes gh-44993

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/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java

@@ -38,7 +38,7 @@
  * @author Jon Schneider
  * @author Andy Wilkinson
  * @since 2.0.0
- * @deprecated since 3.5.0 for removal in 3.7.0
+ * @deprecated since 3.5.0 for removal in 4.0.0
  */
 @AutoConfiguration(
 		before = { CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class },

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java

@@ -30,7 +30,7 @@
  * @author Andy Wilkinson
  * @author Stephane Nicoll
  * @since 2.0.0
- * @deprecated since 3.5.0 for removal in 3.7.0
+ * @deprecated since 3.5.0 for removal in 4.0.0
  */
 @ConfigurationProperties("management.signalfx.metrics.export")
 @Deprecated(since = "3.5.0", forRemoval = true)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapter.java

@@ -25,7 +25,7 @@
  *
  * @author Jon Schneider
  * @since 2.0.0
- * @deprecated since 3.5.0 for removal in 3.7.0
+ * @deprecated since 3.5.0 for removal in 4.0.0
  */
 @Deprecated(since = "3.5.0", forRemoval = true)
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryResourceAttributes.java

@@ -110,7 +110,7 @@ private String getApplicationName() {
 	/**
 	 * Returns the application group.
 	 * @return the application group
-	 * @deprecated since 3.5.0 for removal in 3.7.0
+	 * @deprecated since 3.5.0 for removal in 4.0.0
 	 */
 	@Deprecated(since = "3.5.0", forRemoval = true)
 	private String getApplicationGroup() {

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-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java

@@ -33,7 +33,7 @@
  * Tests for {@link SignalFxMetricsExportAutoConfiguration}.
  *
  * @author Andy Wilkinson
- * @deprecated since 3.5.0 for removal in 3.7.0
+ * @deprecated since 3.5.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.5.0", forRemoval = true)

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapterTests.java

@@ -26,7 +26,7 @@
  * Tests for {@link SignalFxPropertiesConfigAdapter}.
  *
  * @author Mirko Sobeck
- * @deprecated since 3.5.0 for removal in 3.7.0
+ * @deprecated since 3.5.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.5.0", forRemoval = true)

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesTests.java

@@ -27,7 +27,7 @@
  * Tests for {@link SignalFxProperties}.
  *
  * @author Stephane Nicoll
- * @deprecated since 3.5.0 for removal in 3.7.0
+ * @deprecated since 3.5.0 for removal in 4.0.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.5.0", forRemoval = true)

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/condition/ConditionOutcome.java

@@ -153,7 +153,7 @@ public String toString() {
 	 * @param outcome the outcome to inverse
 	 * @return the inverse of the condition outcome
 	 * @since 1.3.0
-	 * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+	 * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
 	 * {@link #ConditionOutcome(boolean, ConditionMessage)}
 	 */
 	@Deprecated(since = "3.5.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/kafka/KafkaConnectionDetails.java

@@ -94,7 +94,7 @@ default Configuration getStreams() {
 	/**
 	 * Returns the list of bootstrap servers used for consumers.
 	 * @return the list of bootstrap servers used for consumers
-	 * @deprecated since 3.5.0 for removal in 3.7.0 in favor of {@link #getConsumer()}
+	 * @deprecated since 3.5.0 for removal in 4.0.0 in favor of {@link #getConsumer()}
 	 */
 	@Deprecated(since = "3.5.0", forRemoval = true)
 	default List<String> getConsumerBootstrapServers() {
@@ -104,7 +104,7 @@ default List<String> getConsumerBootstrapServers() {
 	/**
 	 * Returns the list of bootstrap servers used for producers.
 	 * @return the list of bootstrap servers used for producers
-	 * @deprecated since 3.5.0 for removal in 3.7.0 in favor of {@link #getProducer()}
+	 * @deprecated since 3.5.0 for removal in 4.0.0 in favor of {@link #getProducer()}
 	 */
 	@Deprecated(since = "3.5.0", forRemoval = true)
 	default List<String> getProducerBootstrapServers() {
@@ -114,7 +114,7 @@ default List<String> getProducerBootstrapServers() {
 	/**
 	 * Returns the list of bootstrap servers used for the admin.
 	 * @return the list of bootstrap servers used for the admin
-	 * @deprecated since 3.5.0 for removal in 3.7.0 in favor of {@link #getAdmin()}
+	 * @deprecated since 3.5.0 for removal in 4.0.0 in favor of {@link #getAdmin()}
 	 */
 	@Deprecated(since = "3.5.0", forRemoval = true)
 	default List<String> getAdminBootstrapServers() {
@@ -124,7 +124,7 @@ default List<String> getAdminBootstrapServers() {
 	/**
 	 * Returns the list of bootstrap servers used for Kafka Streams.
 	 * @return the list of bootstrap servers used for Kafka Streams
-	 * @deprecated since 3.5.0 for removal in 3.7.0 in favor of {@link #getStreams()}
+	 * @deprecated since 3.5.0 for removal in 4.0.0 in favor of {@link #getStreams()}
 	 */
 	@Deprecated(since = "3.5.0", forRemoval = true)
 	default List<String> getStreamsBootstrapServers() {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/StandardMongoClientSettingsBuilderCustomizer.java

@@ -55,7 +55,7 @@ public class StandardMongoClientSettingsBuilderCustomizer implements MongoClient
 	 * @param uuidRepresentation the uuid representation
 	 * @param ssl the ssl properties
 	 * @param sslBundles the ssl bundles
-	 * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+	 * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
 	 * {@link #StandardMongoClientSettingsBuilderCustomizer(MongoConnectionDetails, UuidRepresentation)}
 	 */
 	@Deprecated(forRemoval = true, since = "3.5.0")

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-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java

@@ -35,7 +35,7 @@
  *
  * @author Madhura Bhave
  * @since 2.1.0
- * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+ * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
  * {@link ConditionalOnOAuth2ClientRegistrationProperties @ConditionalOnOAuth2ClientRegistrationConfigured}
  */
 @Deprecated(since = "3.5.0", forRemoval = true)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/IssuerUriCondition.java

@@ -30,7 +30,7 @@
  *
  * @author Artsiom Yudovin
  * @since 2.1.0
- * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+ * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
  * {@link ConditionalOnIssuerLocationJwtDecoder @ConditionalOnIssuerLocationJwtDecoder}
  */
 @Deprecated(since = "3.5.0", forRemoval = true)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/KeyValueCondition.java

@@ -29,7 +29,7 @@
  *
  * @author Madhura Bhave
  * @since 2.2.0
- * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+ * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
  * {@link ConditionalOnPublicKeyJwtDecoder @ConditionalOnPublicKeyJwtDecoder}
  */
 @Deprecated(since = "3.5.0", forRemoval = true)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/AntPathRequestMatcherProvider.java

@@ -26,7 +26,7 @@
  *
  * @author Madhura Bhave
  * @since 2.1.8
- * @deprecated since 3.5.0 for removal in 3.8.0 along with {@link RequestMatcherProvider}
+ * @deprecated since 3.5.0 for removal in 4.0.0 along with {@link RequestMatcherProvider}
  */
 @Deprecated(since = "3.5.0", forRemoval = true)
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/RequestMatcherProvider.java

@@ -24,7 +24,7 @@
  *
  * @author Madhura Bhave
  * @since 2.0.5
- * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+ * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
  * {@code org.springframework.boot.actuate.autoconfigure.security.servlet.RequestMatcherProvider}
  */
 @Deprecated(since = "3.5.0", forRemoval = true)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfiguration.java

@@ -41,7 +41,7 @@
  * @author Brian Clozel
  * @author Phillip Webb
  * @since 2.1.0
- * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+ * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
  * {@link org.springframework.boot.autoconfigure.http.client.reactive.ClientHttpConnectorAutoConfiguration}
  * and to align with the deprecation of {@link ReactorNettyHttpClientMapper}
  */

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ReactorNettyHttpClientMapper.java

@@ -32,7 +32,7 @@
  * @author Brian Clozel
  * @author Phillip Webb
  * @since 2.3.0
- * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+ * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
  * {@link ClientHttpConnectorBuilderCustomizer} or declaring a pre-configured
  * {@link ClientHttpConnectorBuilder} bean
  */

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OnEnabledDevToolsCondition.java

@@ -28,7 +28,7 @@
  *
  * @author Madhura Bhave
  * @since 2.2.0
- * @deprecated since 3.5.0 for removal in 3.7.0 in favor of
+ * @deprecated since 3.5.0 for removal in 4.0.0 in favor of
  * {@link ConditionalOnEnabledDevTools @ConditionalOnEnabledDevTools}
  */
 @Deprecated(since = "3.5.0", 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)