Merge branch '1.1.x'

2014-09-22 09:27:13 +01:00 · 2014-09-22 09:27:13 +01:00 · 944045cd34
parent c2e588a37c 5c84e17d10
commit 944045cd34
1 changed files with 1 additions and 0 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfiguration.java
@ -167,6 +167,7 @@ public class ManagementSecurityAutoConfiguration {
 	@Configuration
 	@ConditionalOnExpression("${management.security.enabled:true} && !${security.basic.enabled:true}")
 	@ConditionalOnMissingBean(WebSecurityConfiguration.class)
+	@ConditionalOnWebApplication
 	@EnableWebSecurity
 	protected static class WebSecurityEnabler extends AuthenticationManagerConfiguration {
 	}