Merge branch '2.7.x'

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java

@@ -384,7 +384,7 @@ class ServletWebServerFactoryAutoConfigurationTests {
 				AnnotationConfigServletWebServerApplicationContext::new)
 						.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
 						.withPropertyValues("server.forward-headers-strategy=framework",
-								"server.tomcat.use-relative-redirects=true");
+								"server.tomcat.use-relative-redirects=true", "server.port=0");
 		runner.run((context) -> {
 			Filter filter = context.getBean(FilterRegistrationBean.class).getFilter();
 			assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class);
@@ -398,7 +398,7 @@ class ServletWebServerFactoryAutoConfigurationTests {
 				AnnotationConfigServletWebServerApplicationContext::new)
 						.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
 						.withPropertyValues("server.forward-headers-strategy=framework",
-								"server.tomcat.use-relative-redirects=false");
+								"server.tomcat.use-relative-redirects=false", "server.port=0");
 		runner.run((context) -> {
 			Filter filter = context.getBean(FilterRegistrationBean.class).getFilter();
 			assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class);
@@ -412,7 +412,7 @@ class ServletWebServerFactoryAutoConfigurationTests {
 				AnnotationConfigServletWebServerApplicationContext::new)
 						.withClassLoader(new FilteredClassLoader(Tomcat.class))
 						.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
-						.withPropertyValues("server.forward-headers-strategy=framework");
+						.withPropertyValues("server.forward-headers-strategy=framework", "server.port=0");
 		runner.run((context) -> {
 			Filter filter = context.getBean(FilterRegistrationBean.class).getFilter();
 			assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class);