Merge branch '3.3.x'

Closes gh-41858

Author: mhalbritter

buildSrc/gradle.properties

@@ -1 +1 @@
-javaFormatVersion=0.0.41
+javaFormatVersion=0.0.43

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

@@ -54,6 +54,7 @@ public class PrometheusProperties {
 
 	/**
 	 * 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;
@@ -230,7 +231,7 @@ public void setShutdownOperation(ShutdownOperation shutdownOperation) {
 	@Deprecated(since = "3.3.0", forRemoval = true)
 	public enum HistogramFlavor {
 
-		Prometheus, VictoriaMetrics;
+		Prometheus, VictoriaMetrics
 
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSender.java

@@ -31,6 +31,7 @@
  *
  * @author Moritz Halbritter
  * @author Stefan Bratanov
+ * @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}
  */
 @Deprecated(since = "3.3.0", forRemoval = true)
 class ZipkinRestTemplateSender extends HttpSender {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSender.java

@@ -30,6 +30,7 @@
  *
  * @author Stefan Bratanov
  * @author Moritz Halbritter
+ * @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}
  */
 @Deprecated(since = "3.3.0", forRemoval = true)
 class ZipkinWebClientSender extends HttpSender {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingAutoConfigurationIntegrationTests.java

@@ -45,7 +45,7 @@
  *
  * @author Toshiaki Maki
  */
-public class OtlpLoggingAutoConfigurationIntegrationTests {
+class OtlpLoggingAutoConfigurationIntegrationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withPropertyValues("spring.application.name=otlp-logs-test",

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java

@@ -62,10 +62,10 @@
  * @author Andy Wilkinson
  * @see JerseyEndpointResourceFactory
  */
-public class JerseyWebEndpointIntegrationTests
+class JerseyWebEndpointIntegrationTests
 		extends AbstractWebEndpointIntegrationTests<AnnotationConfigServletWebServerApplicationContext> {
 
-	public JerseyWebEndpointIntegrationTests() {
+	JerseyWebEndpointIntegrationTests() {
 		super(JerseyWebEndpointIntegrationTests::createApplicationContext,
 				JerseyWebEndpointIntegrationTests::applyAuthenticatedConfiguration);
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

@@ -491,6 +491,7 @@ public static class Tomcat {
 
 		/**
 		 * Whether to reject requests with illegal header names or values.
+		 * @deprecated since 2.7.12 for removal in 3.3.0
 		 */
 		@Deprecated(since = "2.7.12", forRemoval = true) // Remove in 3.3
 		private boolean rejectIllegalHeader = true;

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

@@ -39,6 +39,7 @@
  * Tests for {@link JooqExceptionTranslator}
  *
  * @author Andy Wilkinson
+ * @deprecated since 3.3.0 for removal in 3.5.0
  */
 @Deprecated(since = "3.3.0")
 @SuppressWarnings("removal")

spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestDockerTests.java

@@ -42,7 +42,7 @@
  */
 @DataLdapTest
 @Testcontainers(disabledWithoutDocker = true)
-public class DataLdapTestDockerTests {
+class DataLdapTestDockerTests {
 
 	@Container
 	@ServiceConnection

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

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