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

Comment out security condition pending SPR-11069

Browse Source
This commit is contained in:
Dave Syer
2013-11-05 12:20:09 +00:00
parent e43dcd3061
commit c144cae600
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
View File

@@ -96,7 +96,9 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
*/
@Configuration
@ConditionalOnClass({ EnableWebSecurity.class })
@ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
// TODO: re-enable this when SPR-11069 is fixed
// @ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
@ConditionalOnMissingBean(SecurityAutoConfiguration.class)
@EnableConfigurationProperties
public class SecurityAutoConfiguration {

1
spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
View File

@@ -29,5 +29,4 @@ public class SampleDataJpaApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(SampleDataJpaApplication.class, args);
}
}