Comment out security condition pending SPR-11069

2013-11-05 12:20:09 +00:00
parent e43dcd3061
commit c144cae600
2 changed files with 3 additions and 2 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
@@ -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 {