From e7741bf1522ee61298b28d9214cbc38a0a168956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 24 Jul 2026 16:22:59 +0200 Subject: [PATCH] Start building against Spring Framework 7.1.0-M1 snapshots See gh-51123 --- gradle.properties | 2 +- ...eactiveWebEnvironmentUserDefinedTestRestTemplateTests.java | 1 + .../test/SpringBootTestUserDefinedTestRestTemplateTests.java | 1 + .../actuate/endpoint/ProducibleOperationArgumentResolver.java | 4 ++-- .../MessageConverterBackgroundPreinitializer.java | 4 ++-- .../reactive/ReactiveWebServerConfiguration.java | 1 + .../autoconfigure/servlet/ServletWebServerConfiguration.java | 1 + .../AbstractReactiveWebServerAutoConfigurationTests.java | 1 + .../AbstractServletWebServerAutoConfigurationTests.java | 1 + 9 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 52b8a4c8c1c..6368c435041 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ nativeBuildToolsVersion=1.1.5 nullabilityPluginVersion=0.0.14 snakeYamlVersion=2.6 springGrpcVersion=1.1.0 -springFrameworkVersion=7.0.8 +springFrameworkVersion=7.1.0-SNAPSHOT springFramework60xVersion=6.0.23 tomcatVersion=11.0.24 protobufGradlePluginVersion=0.9.6 diff --git a/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java b/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java index 30b0ee966f1..1202f9b183c 100644 --- a/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java +++ b/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java @@ -40,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.main.web-application-type=reactive", "value=123" }) @Deprecated(since = "4.2.0", forRemoval = true) +@SuppressWarnings("removal") class SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests extends AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests { diff --git a/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestUserDefinedTestRestTemplateTests.java b/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestUserDefinedTestRestTemplateTests.java index 33708468941..b6259816a8a 100644 --- a/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestUserDefinedTestRestTemplateTests.java +++ b/integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/SpringBootTestUserDefinedTestRestTemplateTests.java @@ -40,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DirtiesContext @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "value=123" }) @Deprecated(since = "4.2.0", forRemoval = true) +@SuppressWarnings("removal") class SpringBootTestUserDefinedTestRestTemplateTests extends AbstractSpringBootTestWebServerWebEnvironmentTests { @Test diff --git a/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ProducibleOperationArgumentResolver.java b/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ProducibleOperationArgumentResolver.java index 39ddca4f61c..996512949b8 100644 --- a/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ProducibleOperationArgumentResolver.java +++ b/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ProducibleOperationArgumentResolver.java @@ -66,8 +66,8 @@ public class ProducibleOperationArgumentResolver implements OperationArgumentRes } Enum> result = null; for (String accept : accepts) { - for (String mimeType : MimeTypeUtils.tokenize(accept)) { - result = mostRecent(result, forMimeType(values, MimeTypeUtils.parseMimeType(mimeType))); + for (MimeType mimeType : MimeTypeUtils.parseMimeTypes(accept)) { + result = mostRecent(result, forMimeType(values, mimeType)); } } return result; diff --git a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/MessageConverterBackgroundPreinitializer.java b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/MessageConverterBackgroundPreinitializer.java index c0b83033b20..c32cd8db4c7 100644 --- a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/MessageConverterBackgroundPreinitializer.java +++ b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/MessageConverterBackgroundPreinitializer.java @@ -18,7 +18,7 @@ package org.springframework.boot.http.converter.autoconfigure; import org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializer; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; +import org.springframework.http.converter.multipart.MultipartHttpMessageConverter; /** * {@link BackgroundPreinitializer} Spring's {@link HttpMessageConverter} implementations. @@ -29,7 +29,7 @@ final class MessageConverterBackgroundPreinitializer implements BackgroundPreini @Override public void preinitialize() throws Exception { - new AllEncompassingFormHttpMessageConverter(); + new MultipartHttpMessageConverter(); } } diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/reactive/ReactiveWebServerConfiguration.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/reactive/ReactiveWebServerConfiguration.java index 14938716e96..5cdfe79f60b 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/reactive/ReactiveWebServerConfiguration.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/reactive/ReactiveWebServerConfiguration.java @@ -60,6 +60,7 @@ public class ReactiveWebServerConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework") + @SuppressWarnings("removal") // gh-51030 ForwardedHeaderTransformer forwardedHeaderTransformer() { return new ForwardedHeaderTransformer(); } diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/servlet/ServletWebServerConfiguration.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/servlet/ServletWebServerConfiguration.java index 088f134ace4..240c366b9ab 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/servlet/ServletWebServerConfiguration.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/servlet/ServletWebServerConfiguration.java @@ -72,6 +72,7 @@ public class ServletWebServerConfiguration { @Bean @ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework") @ConditionalOnMissingFilterBean(ForwardedHeaderFilter.class) + @SuppressWarnings("removal") // gh-51030 FilterRegistrationBean forwardedHeaderFilter( ObjectProvider customizerProvider) { ForwardedHeaderFilter filter = new ForwardedHeaderFilter(); diff --git a/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/reactive/AbstractReactiveWebServerAutoConfigurationTests.java b/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/reactive/AbstractReactiveWebServerAutoConfigurationTests.java index 57f7e316ce7..ef009c0c044 100644 --- a/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/reactive/AbstractReactiveWebServerAutoConfigurationTests.java +++ b/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/reactive/AbstractReactiveWebServerAutoConfigurationTests.java @@ -178,6 +178,7 @@ public abstract class AbstractReactiveWebServerAutoConfigurationTests { static class ForwardedHeaderTransformerConfiguration { @Bean + @SuppressWarnings("removal") // gh-51030 ForwardedHeaderTransformer testForwardedHeaderTransformer() { return new ForwardedHeaderTransformer(); } diff --git a/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/servlet/AbstractServletWebServerAutoConfigurationTests.java b/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/servlet/AbstractServletWebServerAutoConfigurationTests.java index 27f4b97aad6..83698582c0e 100644 --- a/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/servlet/AbstractServletWebServerAutoConfigurationTests.java +++ b/module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/servlet/AbstractServletWebServerAutoConfigurationTests.java @@ -212,6 +212,7 @@ public abstract class AbstractServletWebServerAutoConfigurationTests { static class ForwardedHeaderFilterConfiguration { @Bean + @SuppressWarnings("removal") // gh-51030 FilterRegistrationBean testForwardedHeaderFilter() { ForwardedHeaderFilter filter = new ForwardedHeaderFilter(); return new FilterRegistrationBean<>(filter);