Remove APIs deprecated for removal in 3.5

Closes gh-43788

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -49,7 +49,6 @@ dependencies {
 	optional("io.micrometer:micrometer-registry-new-relic")
 	optional("io.micrometer:micrometer-registry-otlp")
 	optional("io.micrometer:micrometer-registry-prometheus")
-	optional("io.micrometer:micrometer-registry-prometheus-simpleclient")
 	optional("io.micrometer:micrometer-registry-stackdriver") {
 		exclude group: "commons-logging", module: "commons-logging"
 		exclude group: "javax.annotation", module: "javax.annotation-api"

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,10 +78,8 @@ PrometheusRegistry prometheusRegistry() {
 	@ConditionalOnAvailableEndpoint(PrometheusScrapeEndpoint.class)
 	static class PrometheusScrapeEndpointConfiguration {
 
-		@SuppressWarnings("removal")
 		@Bean
-		@ConditionalOnMissingBean({ PrometheusScrapeEndpoint.class,
-				org.springframework.boot.actuate.metrics.export.prometheus.PrometheusSimpleclientScrapeEndpoint.class })
+		@ConditionalOnMissingBean
 		PrometheusScrapeEndpoint prometheusEndpoint(PrometheusRegistry prometheusRegistry,
 				PrometheusConfig prometheusConfig) {
 			return new PrometheusScrapeEndpoint(prometheusRegistry, prometheusConfig.prometheusProperties());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 
 import org.springframework.boot.actuate.metrics.export.prometheus.PrometheusPushGatewayManager.ShutdownOperation;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 
 /**
  * {@link ConfigurationProperties @ConfigurationProperties} for configuring metrics export
@@ -52,13 +51,6 @@ public class PrometheusProperties {
 	 */
 	private final Pushgateway pushgateway = new Pushgateway();
 
-	/**
-	 * Histogram type for backing DistributionSummary and Timer.
-	 * @deprecated since 3.3.0 for removal in 3.5.0
-	 */
-	@Deprecated(since = "3.3.0", forRemoval = true)
-	private HistogramFlavor histogramFlavor = HistogramFlavor.Prometheus;
-
 	/**
 	 * Additional properties to pass to the Prometheus client.
 	 */
@@ -77,17 +69,6 @@ public void setDescriptions(boolean descriptions) {
 		this.descriptions = descriptions;
 	}
 
-	@Deprecated(since = "3.3.0", forRemoval = true)
-	@DeprecatedConfigurationProperty(since = "3.3.0",
-			reason = "No longer supported. Works only when using the Prometheus simpleclient.")
-	public HistogramFlavor getHistogramFlavor() {
-		return this.histogramFlavor;
-	}
-
-	public void setHistogramFlavor(HistogramFlavor histogramFlavor) {
-		this.histogramFlavor = histogramFlavor;
-	}
-
 	public Duration getStep() {
 		return this.step;
 	}
@@ -223,16 +204,4 @@ public void setShutdownOperation(ShutdownOperation shutdownOperation) {
 
 	}
 
-	/**
-	 * Prometheus Histogram flavor.
-	 *
-	 * @deprecated since 3.3.0 for removal in 3.5.0
-	 */
-	@Deprecated(since = "3.3.0", forRemoval = true)
-	public enum HistogramFlavor {
-
-		Prometheus, VictoriaMetrics
-
-	}
-
 }