Make ServerProperties bean conditional on being a webapp

Author: Dave Syer

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfiguration.java

@@ -122,7 +122,7 @@ private static class IgnoredPathsWebSecurityConfigurerAdapter implements
 		@Autowired
 		private SecurityProperties security;
 
-		@Autowired
+		@Autowired(required = false)
 		private ServerProperties server;
 
 		@Override
@@ -148,8 +148,10 @@ public void init(WebSecurity builder) throws Exception {
 			if (this.errorController != null) {
 				ignored.add(normalizePath(this.errorController.getErrorPath()));
 			}
-			String[] paths = this.server.getPathsArray(ignored);
-			ignoring.antMatchers(paths);
+			if (this.server != null) {
+				String[] paths = this.server.getPathsArray(ignored);
+				ignoring.antMatchers(paths);
+			}
 		}
 
 		private String normalizePath(String errorPath) {

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java

@@ -20,6 +20,7 @@
 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.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
@@ -55,6 +56,7 @@ public SecurityProperties securityProperties() {
 	// In case server auto configuration hasn't been included
 	@Bean
 	@ConditionalOnMissingBean
+	@ConditionalOnWebApplication
 	public ServerProperties serverProperties() {
 		return new ServerProperties();
 	}