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)