Move remaining properties for consistency

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

@@ -44,14 +44,12 @@ import org.crsh.vfs.spi.AbstractFSDriver;
 import org.crsh.vfs.spi.FSDriver;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.properties.ManagementServerProperties;
-import org.springframework.boot.actuate.properties.ShellProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.CrshShellAuthenticationProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.CrshShellProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.JaasAuthenticationProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.KeyAuthenticationProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.SimpleAuthenticationProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.SpringAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.CrshShellAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.CrshShellProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.JaasAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.KeyAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.SimpleAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.SpringAuthenticationProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

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

@@ -38,7 +38,6 @@ import org.springframework.boot.actuate.endpoint.mvc.EnvironmentMvcEndpoint;
 import org.springframework.boot.actuate.endpoint.mvc.MetricsMvcEndpoint;
 import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints;
 import org.springframework.boot.actuate.endpoint.mvc.ShutdownMvcEndpoint;
-import org.springframework.boot.actuate.properties.ManagementServerProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;

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

@@ -31,7 +31,6 @@ import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.boot.actuate.endpoint.mvc.ManagementErrorEndpoint;
 import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
 import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints;
-import org.springframework.boot.actuate.properties.ManagementServerProperties;
 import org.springframework.boot.actuate.web.ErrorController;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

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

@@ -28,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
-import org.springframework.boot.actuate.properties.ManagementServerProperties;
 import org.springframework.boot.actuate.web.ErrorController;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ManagementServerProperties.java → spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.properties;
+package org.springframework.boot.actuate.autoconfigure;
 
 import java.net.InetAddress;
 

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

@@ -16,7 +16,6 @@
 
 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;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ShellProperties.java → spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.properties;
+package org.springframework.boot.actuate.autoconfigure;
 
 import java.util.ArrayList;
 import java.util.Arrays;

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java

@@ -25,7 +25,6 @@ import org.junit.After;
 import org.junit.Test;
 import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
-import org.springframework.boot.actuate.properties.ManagementServerProperties;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.autoconfigure;
 
 import org.junit.Test;
-import org.springframework.boot.actuate.properties.ManagementServerProperties;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/ShellPropertiesTests.java → spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.properties;
+package org.springframework.boot.actuate.autoconfigure;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,11 +27,12 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration;
-import org.springframework.boot.actuate.properties.ShellProperties.CrshShellProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.JaasAuthenticationProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.KeyAuthenticationProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.SimpleAuthenticationProperties;
-import org.springframework.boot.actuate.properties.ShellProperties.SpringAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.CrshShellProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.JaasAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.KeyAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.SimpleAuthenticationProperties;
+import org.springframework.boot.actuate.autoconfigure.ShellProperties.SpringAuthenticationProperties;
 import org.springframework.boot.bind.RelaxedDataBinder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;