From b05ffd1164c24e8e0dcd9159f69532700aebb9a5 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 12 Dec 2013 16:04:20 +0000 Subject: [PATCH] Add extra condition to security properties config --- .../ManagementServerPropertiesAutoConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index 58643c3bab9..0bd95b446a5 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -19,12 +19,14 @@ package org.springframework.boot.actuate.autoconfigure; import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.security.SecurityProperties; import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; /** * {@link EnableAutoConfiguration Auto-configuration} for the @@ -46,6 +48,7 @@ public class ManagementServerPropertiesAutoConfiguration { // In case security auto configuration hasn't been included @Bean(name = "org.springframework.autoconfigure.security.SecurityProperties") @ConditionalOnMissingBean + @ConditionalOnClass(EnableWebSecurity.class) public SecurityProperties securityProperties() { return new SecurityProperties(); }