Merge branch '2.4.x'

spring-projects · Jan 4, 2021 · b62325a · b62325a
2 parents ca1ad14 + 86e94b9
commit b62325a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 88 deletions.
diff --git a/...k/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java b/...k/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java
@@ -63,7 +63,6 @@ SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) throws Exce
 			requests.requestMatchers(EndpointRequest.to(HealthEndpoint.class, InfoEndpoint.class)).permitAll();
 			requests.anyRequest().authenticated();
 		});
-		http.cors();
 		http.formLogin(Customizer.withDefaults());
 		http.httpBasic(Customizer.withDefaults());
 		return http.build();

diff --git a/...t/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java b/...t/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java
@@ -30,7 +30,6 @@
 import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.saml2.Saml2RelyingPartyAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
@@ -62,7 +61,7 @@ class ManagementWebSecurityAutoConfigurationTests {
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner().withConfiguration(
 			AutoConfigurations.of(HealthContributorAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
 					InfoEndpointAutoConfiguration.class, EnvironmentEndpointAutoConfiguration.class,
-					EndpointAutoConfiguration.class, WebMvcAutoConfiguration.class, WebEndpointAutoConfiguration.class,
+					EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
 					SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class));
 
 	@Test

diff --git a/...ke-test-actuator/src/test/java/smoketest/actuator/CorsSampleActuatorApplicationTests.java b/...ke-test-actuator/src/test/java/smoketest/actuator/CorsSampleActuatorApplicationTests.java
diff --git a/...moke-tests/spring-boot-smoke-test-actuator/src/test/resources/application-cors.properties b/...moke-tests/spring-boot-smoke-test-actuator/src/test/resources/application-cors.properties