Remove code deprecated in 2.x and add since and forRemoval attributes

Closes gh-32548
Closes gh-32549

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpoint.java

@@ -48,18 +48,6 @@ public class HealthEndpoint extends HealthEndpointSupport<HealthContributor, Hea
 
 	private static final String[] EMPTY_PATH = {};
 
-	/**
-	 * Create a new {@link HealthEndpoint} instance.
-	 * @param registry the health contributor registry
-	 * @param groups the health endpoint groups
-	 * @deprecated since 2.6.9 for removal in 3.0.0 in favor of
-	 * {@link #HealthEndpoint(HealthContributorRegistry, HealthEndpointGroups, Duration)}
-	 */
-	@Deprecated
-	public HealthEndpoint(HealthContributorRegistry registry, HealthEndpointGroups groups) {
-		super(registry, groups, null);
-	}
-
 	/**
 	 * Create a new {@link HealthEndpoint} instance.
 	 * @param registry the health contributor registry

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpointWebExtension.java

@@ -50,18 +50,6 @@ public class HealthEndpointWebExtension extends HealthEndpointSupport<HealthCont
 
 	private static final String[] NO_PATH = {};
 
-	/**
-	 * Create a new {@link HealthEndpointWebExtension} instance.
-	 * @param registry the health contributor registry
-	 * @param groups the health endpoint groups
-	 * @deprecated since 2.6.9 for removal in 3.0.0 in favor of
-	 * {@link #HealthEndpointWebExtension(HealthContributorRegistry, HealthEndpointGroups, Duration)}
-	 */
-	@Deprecated
-	public HealthEndpointWebExtension(HealthContributorRegistry registry, HealthEndpointGroups groups) {
-		super(registry, groups, null);
-	}
-
 	/**
 	 * Create a new {@link HealthEndpointWebExtension} instance.
 	 * @param registry the health contributor registry

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthEndpointWebExtension.java

@@ -50,18 +50,6 @@ public class ReactiveHealthEndpointWebExtension
 
 	private static final String[] NO_PATH = {};
 
-	/**
-	 * Create a new {@link ReactiveHealthEndpointWebExtension} instance.
-	 * @param registry the health contributor registry
-	 * @param groups the health endpoint groups
-	 * @deprecated since 2.6.9 for removal in 3.0.0 in favor of
-	 * {@link #ReactiveHealthEndpointWebExtension(ReactiveHealthContributorRegistry, HealthEndpointGroups, Duration)}
-	 */
-	@Deprecated
-	public ReactiveHealthEndpointWebExtension(ReactiveHealthContributorRegistry registry, HealthEndpointGroups groups) {
-		super(registry, groups, null);
-	}
-
 	/**
 	 * Create a new {@link ReactiveHealthEndpointWebExtension} instance.
 	 * @param registry the health contributor registry

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusPushGatewayManager.java

@@ -166,7 +166,7 @@ public class PrometheusPushGatewayManager {
 		 * Perform a POST before shutdown.
 		 * @deprecated since 3.0.0 for removal in 3.2.0 in favor of {@link #POST}.
 		 */
-		@Deprecated
+		@Deprecated(since = "3.0.0", forRemoval = true)
 		PUSH,
 
 		/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/DefaultRestTemplateExchangeTagsProvider.java

@@ -34,7 +34,8 @@ import org.springframework.util.StringUtils;
  * @deprecated since 3.0.0 for removal in 3.2.0 in favor of
  * {@link DefaultClientHttpObservationConvention}
  */
-@Deprecated
+@Deprecated(since = "3.0.0", forRemoval = true)
+@SuppressWarnings({ "deprecation", "removal" })
 public class DefaultRestTemplateExchangeTagsProvider implements RestTemplateExchangeTagsProvider {
 
 	@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/RestTemplateExchangeTags.java

@@ -41,7 +41,7 @@ import org.springframework.web.client.RestTemplate;
  * @deprecated since 3.0.0 for removal in 3.2.0 in favor of
  * {@link DefaultClientHttpObservationConvention}
  */
-@Deprecated
+@Deprecated(since = "3.0.0", forRemoval = true)
 public final class RestTemplateExchangeTags {
 
 	private static final Pattern STRIP_URI_PATTERN = Pattern.compile("^https?://[^/]+/");

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/RestTemplateExchangeTagsProvider.java

@@ -33,7 +33,7 @@ import org.springframework.web.client.RestTemplate;
  * {@link ClientHttpObservationConvention}
  */
 @FunctionalInterface
-@Deprecated
+@Deprecated(since = "3.0.0", forRemoval = true)
 public interface RestTemplateExchangeTagsProvider {
 
 	/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTagsProvider.java

@@ -31,7 +31,7 @@ import org.springframework.web.reactive.function.client.ClientResponse;
  * {@link org.springframework.web.reactive.function.client.ClientObservationConvention}
  */
 @FunctionalInterface
-@Deprecated
+@Deprecated(since = "3.0.0", forRemoval = true)
 public interface WebClientExchangeTagsProvider {
 
 	/**

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusPushGatewayManagerTests.java

@@ -135,7 +135,8 @@ class PrometheusPushGatewayManagerTests {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("removal")
+	@Deprecated(since = "3.0.0", forRemoval = true)
 	void shutdownWhenShutdownOperationIsPushPerformsPushAddOnShutdown() throws Exception {
 		givenScheduleAtFixedRateWithReturnFuture();
 		PrometheusPushGatewayManager manager = new PrometheusPushGatewayManager(this.pushGateway, this.registry,

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/RestTemplateExchangeTagsTests.java

@@ -38,7 +38,8 @@ import static org.mockito.Mockito.mock;
  * @author Nishant Raut
  * @author Brian Clozel
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({ "removal" })
+@Deprecated(since = "3.0.0", forRemoval = true)
 class RestTemplateExchangeTagsTests {
 
 	@Test