Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2018-10-16 13:31:35 +01:00
parent 620d88e4ed 1150f46b40
commit bd0a41d82d
6 changed files with 477 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/web/servlet/ServletWebSecurityAutoConfiguration.java
View File

@@ -17,10 +17,12 @@
package org.springframework.boot.autoconfigure.security.web.servlet;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.boot.autoconfigure.security.UserDetailsServiceAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -37,6 +39,7 @@ import org.springframework.security.authentication.DefaultAuthenticationEventPub
@EnableConfigurationProperties(SecurityProperties.class)
@ConditionalOnClass(DefaultAuthenticationEventPublisher.class)
@AutoConfigureAfter(SecurityAutoConfiguration.class)
@AutoConfigureBefore(UserDetailsServiceAutoConfiguration.class)
@Import({ SpringBootWebSecurityConfiguration.class,
EnableWebSecurityConfiguration.class })
public class ServletWebSecurityAutoConfiguration {