Skip to content

Commit 2a84fe5

Browse files
mhalbrittermhalbritter
committed
Merge branch '3.2.x' into 3.3.x
Closes gh-41857
2 parents cae3a6a + 1d45016 commit 2a84fe5

File tree

23 files changed

+28
-11
lines changed

23 files changed

+28
-11
lines changed

‎buildSrc/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
javaFormatVersion=0.0.41
1+
javaFormatVersion=0.0.43

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class PrometheusProperties {
5454

5555
/**
5656
* Histogram type for backing DistributionSummary and Timer.
57+
* @deprecated since 3.3.0 for removal in 3.5.0
5758
*/
5859
@Deprecated(since = "3.3.0", forRemoval = true)
5960
private HistogramFlavor histogramFlavor = HistogramFlavor.Prometheus;
@@ -230,7 +231,7 @@ public void setShutdownOperation(ShutdownOperation shutdownOperation) {
230231
@Deprecated(since = "3.3.0", forRemoval = true)
231232
public enum HistogramFlavor {
232233

233-
Prometheus, VictoriaMetrics;
234+
Prometheus, VictoriaMetrics
234235

235236
}
236237

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*
3232
* @author Moritz Halbritter
3333
* @author Stefan Bratanov
34+
* @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}
3435
*/
3536
@Deprecated(since = "3.3.0", forRemoval = true)
3637
class ZipkinRestTemplateSender extends HttpSender {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*
3131
* @author Stefan Bratanov
3232
* @author Moritz Halbritter
33+
* @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}
3334
*/
3435
@Deprecated(since = "3.3.0", forRemoval = true)
3536
class ZipkinWebClientSender extends HttpSender {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthContributorAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* Tests for {@link InfluxDbHealthContributorAutoConfiguration}.
3232
*
3333
* @author Eddú Meléndez
34+
* @deprecated since 3.2.0 for removal in 3.4.0
3435
*/
3536
@SuppressWarnings("removal")
3637
@Deprecated(since = "3.2.0", forRemoval = true)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
* @author Andy Wilkinson
6363
* @see JerseyEndpointResourceFactory
6464
*/
65-
public class JerseyWebEndpointIntegrationTests
65+
class JerseyWebEndpointIntegrationTests
6666
extends AbstractWebEndpointIntegrationTests<AnnotationConfigServletWebServerApplicationContext> {
6767

68-
public JerseyWebEndpointIntegrationTests() {
68+
JerseyWebEndpointIntegrationTests() {
6969
super(JerseyWebEndpointIntegrationTests::createApplicationContext,
7070
JerseyWebEndpointIntegrationTests::applyAuthenticatedConfiguration);
7171
}

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/influx/InfluxDbHealthIndicatorTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* Tests for {@link InfluxDbHealthIndicator}.
3636
*
3737
* @author Eddú Meléndez
38+
* @deprecated since 3.2.0 for removal in 3.4.0
3839
*/
3940
@SuppressWarnings("removal")
4041
@Deprecated(since = "3.2.0", forRemoval = true)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ public static class Tomcat {
491491

492492
/**
493493
* Whether to reject requests with illegal header names or values.
494+
* @deprecated since 2.7.12 for removal in 3.3.0
494495
*/
495496
@Deprecated(since = "2.7.12", forRemoval = true) // Remove in 3.3
496497
private boolean rejectIllegalHeader = true;

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
* @author Moritz Halbritter
4242
* @author Andy Wilkinson
4343
* @author Phillip Webb
44+
* @deprecated since 3.2.0 for removal in 3.4.0
4445
*/
4546
@SuppressWarnings("removal")
4647
@Deprecated(since = "3.2.0", forRemoval = true)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
* Tests for {@link JooqExceptionTranslator}
4040
*
4141
* @author Andy Wilkinson
42+
* @deprecated since 3.3.0 for removal in 3.5.0
4243
*/
4344
@Deprecated(since = "3.3.0")
4445
@SuppressWarnings("removal")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
@DataLdapTest
4444
@Testcontainers(disabledWithoutDocker = true)
45-
public class DataLdapTestDockerTests {
45+
class DataLdapTestDockerTests {
4646

4747
@Container
4848
@ServiceConnection

‎spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@SpringBootTest
3636
@DisabledIfDockerUnavailable
3737
@ImportTestcontainers(LoadTimeWeaverAwareConsumerContainers.class)
38-
public class LoadTimeWeaverAwareConsumerImportTestcontainersTests implements LoadTimeWeaverAwareConsumerContainers {
38+
class LoadTimeWeaverAwareConsumerImportTestcontainersTests implements LoadTimeWeaverAwareConsumerContainers {
3939

4040
@Autowired
4141
private LoadTimeWeaverAwareConsumer consumer;

‎spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@TestPropertySource(properties = "spring.testcontainers.beans.startup=parallel")
4444
@DisabledIfDockerUnavailable
4545
@ExtendWith(OutputCaptureExtension.class)
46-
public class TestContainersParallelStartupIntegrationTests {
46+
class TestContainersParallelStartupIntegrationTests {
4747

4848
@Test
4949
void startsInParallel(CapturedOutput out) {

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* Deprecated configuration properties.
2626
*
2727
* @author Stephane Nicoll
28+
* @deprecated deprecated
2829
*/
2930
@Getter
3031
@Setter

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedClassMethodConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* Sample for testing method configuration with deprecated class.
2323
*
2424
* @author Stephane Nicoll
25+
* @deprecated deprecated
2526
*/
2627
@Deprecated
2728
public class DeprecatedClassMethodConfig {

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* Deprecated configuration properties.
2323
*
2424
* @author Stephane Nicoll
25+
* @deprecated deprecated
2526
*/
2627
@Deprecated
2728
@ConfigurationProperties(prefix = "deprecated")

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/VirtualZipPerformanceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @author Phillip Webb
3838
*/
3939
@Disabled("Only used for manual testing")
40-
public class VirtualZipPerformanceTests {
40+
class VirtualZipPerformanceTests {
4141

4242
@TempDir
4343
Path temp;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ private static HttpClient createHttpClient(Duration readTimeout, SslBundle sslBu
223223
/**
224224
* Support for
225225
* {@link org.springframework.http.client.OkHttp3ClientHttpRequestFactory}.
226+
*
227+
* @deprecated since 3.2.0 for removal in 3.4.0
226228
*/
227229
@Deprecated(since = "3.2.0", forRemoval = true)
228230
@SuppressWarnings("removal")

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* Tests for {@link DelegatingApplicationContextInitializer}.
3636
*
3737
* @author Phillip Webb
38+
* @deprecated since 3.2.0 for removal in 3.4.0
3839
*/
3940
@Deprecated(since = "3.2.0", forRemoval = true)
4041
@SuppressWarnings("removal")

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
* Tests for {@link DelegatingApplicationListener}.
3737
*
3838
* @author Dave Syer
39+
* @deprecated since 3.2.0 for removal in 3.4.0
3940
*/
4041
@Deprecated(since = "3.2.0", forRemoval = true)
4142
@SuppressWarnings("removal")

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp3Tests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@
3333
* client.
3434
*
3535
* @author Andy Wilkinson
36+
* @deprecated since 3.2.0 for removal in 3.4.0
3637
*/
3738
@ClassPathOverrides("com.squareup.okhttp3:okhttp:3.14.9")
3839
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar" })
39-
@Deprecated(since = "3.2.0")
40+
@Deprecated(since = "3.2.0", forRemoval = true)
4041
@SuppressWarnings("removal")
4142
class ClientHttpRequestFactoriesOkHttp3Tests
4243
extends AbstractClientHttpRequestFactoriesTests<OkHttp3ClientHttpRequestFactory> {

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp4Tests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
3232
* client.
3333
*
3434
* @author Andy Wilkinson
35+
* @deprecated since 3.2.0 for removal in 3.4.0
3536
*/
3637
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar" })
37-
@Deprecated(since = "3.2.0")
38+
@Deprecated(since = "3.2.0", forRemoval = true)
3839
@SuppressWarnings("removal")
3940
class ClientHttpRequestFactoriesOkHttp4Tests
4041
extends AbstractClientHttpRequestFactoriesTests<OkHttp3ClientHttpRequestFactory> {

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Dave Syer
3434
* @author Phillip Webb
3535
*/
36-
public class SampleAntApplicationIT {
36+
class SampleAntApplicationIT {
3737

3838
@Test
3939
void runJar() throws Exception {

0 commit comments

Comments
 (0)