Skip to content

S
spring-boot
Commit 95a0be3c authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.2.x'

parents 16d61f84 219317e8
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java
View file @ 95a0be3c
...@@ -87,7 +87,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor; ...@@ -87,7 +87,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
*/ */
@Configuration @Configuration
@EnableConfigurationProperties @EnableConfigurationProperties
@ConditionalOnClass({ EnableWebSecurity.class }) @ConditionalOnClass({ EnableWebSecurity.class, AuthenticationEntryPoint.class })
@ConditionalOnMissingBean(WebSecurityConfiguration.class) @ConditionalOnMissingBean(WebSecurityConfiguration.class)
@ConditionalOnWebApplication @ConditionalOnWebApplication
public class SpringBootWebSecurityConfiguration { public class SpringBootWebSecurityConfiguration {
......
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