Skip to content

S
spring-boot
Commit 8d89f8fc authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.2.x'

parents 99de71bf 8b20403c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
View file @ 8d89f8fc
...@@ -158,7 +158,7 @@ public class EndpointWebMvcChildContextConfiguration { ...@@ -158,7 +158,7 @@ public class EndpointWebMvcChildContextConfiguration {
* configures the security filter. * configures the security filter.
*/ */
@Configuration @Configuration
@ConditionalOnMissingClass(WebSecurityConfigurerAdapter.class) @ConditionalOnMissingClass(name = "org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter")
protected static class EndpointHandlerMappingConfiguration { protected static class EndpointHandlerMappingConfiguration {
@Autowired(required = false) @Autowired(required = false)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment