Comment out security condition pending SPR-11069

pull/118/merge
Dave Syer 11 years ago
parent e43dcd3061
commit c144cae600

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

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

Loading…
Cancel
Save