Restructure autoconfigure project

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository;
 import org.springframework.zero.actuate.audit.listener.AuditListener;
 import org.springframework.zero.actuate.security.AuthenticationAuditListener;
 import org.springframework.zero.actuate.security.AuthorizationAuditListener;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java

@@ -44,8 +44,8 @@ import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
 import org.springframework.zero.actuate.metrics.MetricRepository;
 import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
 import org.springframework.zero.actuate.trace.TraceRepository;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.bind.PropertiesConfigurationFactory;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**

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

@@ -35,11 +35,11 @@ import org.springframework.zero.actuate.endpoint.Endpoint;
 import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter;
 import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.zero.actuate.properties.ManagementServerProperties;
+import org.springframework.zero.autoconfigure.AutoConfigureAfter;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
 import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.zero.context.annotation.AutoConfigureAfter;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java

@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.zero.actuate.web.BasicErrorController;
 import org.springframework.zero.actuate.web.ErrorController;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;

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

@@ -18,9 +18,9 @@ package org.springframework.zero.actuate.autoconfigure;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.actuate.properties.ManagementServerProperties;
+import org.springframework.zero.autoconfigure.AutoConfigureAfter;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration;
-import org.springframework.zero.context.annotation.AutoConfigureAfter;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 import org.springframework.zero.context.properties.EnableConfigurationProperties;
 

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java

@@ -37,8 +37,8 @@ import org.springframework.web.filter.GenericFilterBean;
 import org.springframework.web.util.UrlPathHelper;
 import org.springframework.zero.actuate.metrics.CounterService;
 import org.springframework.zero.actuate.metrics.GaugeService;
-import org.springframework.zero.context.annotation.AutoConfigureAfter;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.AutoConfigureAfter;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnBean;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java

@@ -24,7 +24,7 @@ import org.springframework.zero.actuate.metrics.DefaultGaugeService;
 import org.springframework.zero.actuate.metrics.GaugeService;
 import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
 import org.springframework.zero.actuate.metrics.MetricRepository;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java

@@ -41,7 +41,7 @@ import org.springframework.zero.actuate.endpoint.Endpoint;
 import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.zero.actuate.properties.SecurityProperties;
 import org.springframework.zero.actuate.web.ErrorController;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 import org.springframework.zero.context.properties.EnableConfigurationProperties;

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java

@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
 import org.springframework.zero.actuate.trace.TraceRepository;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**

spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java

@@ -24,8 +24,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.zero.actuate.trace.TraceRepository;
 import org.springframework.zero.actuate.trace.WebRequestTraceFilter;
-import org.springframework.zero.context.annotation.AutoConfigureAfter;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.AutoConfigureAfter;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 
 /**

spring-zero-actuator/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
-org.springframework.zero.context.annotation.EnableAutoConfiguration=\
+org.springframework.zero.autoconfigure.EnableAutoConfiguration=\
 org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration,\
 org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration,\
 org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.zero.context.annotation;
+package org.springframework.zero.autoconfigure;
 
 import java.io.IOException;
 import java.util.ArrayList;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.zero.context.annotation;
+package org.springframework.zero.autoconfigure;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.annotation;
+package org.springframework.zero.autoconfigure;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,7 +42,6 @@ import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.autoconfigure.AutoConfigurationUtils;
 
 /**
  * Helper to detect a component scan declared in the enclosing context (normally on a

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.annotation;
+package org.springframework.zero.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.annotation;
+package org.springframework.zero.autoconfigure;
 
 import java.io.IOException;
 import java.util.ArrayList;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java

@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java

@@ -22,7 +22,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java

@@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.CommandLineRunner;
 import org.springframework.zero.ExitCodeGenerator;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnBean;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java

@@ -21,7 +21,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java

@@ -46,7 +46,7 @@ import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils;
 import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionLogUtils;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.core.Ordered;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnBean;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java

@@ -28,7 +28,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.util.ClassUtils;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for embedded databases.

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java

@@ -30,7 +30,7 @@ import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 
 /**

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java

@@ -35,8 +35,8 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.util.Assert;
 import org.springframework.zero.autoconfigure.AutoConfigurationUtils;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnBean;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

@@ -31,9 +31,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.zero.autoconfigure.AutoConfigureAfter;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.zero.context.annotation.AutoConfigureAfter;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 import org.springframework.zero.context.condition.ConditionalOnMissingClass;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java

@@ -22,7 +22,7 @@ import javax.servlet.Servlet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.multipart.support.StandardServletMultipartResolver;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnBean;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.embedded.EmbeddedWebApplicationContext;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java

@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
 import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java

@@ -48,8 +48,8 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 import org.springframework.web.servlet.view.BeanNameViewResolver;
 import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
-import org.springframework.zero.context.annotation.AutoConfigureAfter;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.AutoConfigureAfter;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.condition.ConditionalOnBean;
 import org.springframework.zero.context.condition.ConditionalOnClass;
 import org.springframework.zero.context.condition.ConditionalOnMissingBean;

spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.SpringVersion;
 import org.springframework.util.ClassUtils;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 /**
  * Very simple main class that can be used to launch an application from sources (class,

spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,5 @@
 # Auto Configure
-org.springframework.zero.context.annotation.EnableAutoConfiguration=\
+org.springframework.zero.autoconfigure.EnableAutoConfiguration=\
 org.springframework.zero.autoconfigure.MessageSourceAutoConfiguration,\
 org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration,\
 org.springframework.zero.autoconfigure.batch.BatchAutoConfiguration,\

spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.zero.context.annotation;
+package org.springframework.zero.autoconfigure;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,8 +25,8 @@ import org.junit.rules.ExpectedException;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.zero.context.annotation.AutoConfigurationSorter;
-import org.springframework.zero.context.annotation.AutoConfigureAfter;
+import org.springframework.zero.autoconfigure.AutoConfigurationSorter;
+import org.springframework.zero.autoconfigure.AutoConfigureAfter;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.annotation;
+package org.springframework.zero.autoconfigure;
 
 import org.springframework.context.annotation.Import;
-import org.springframework.zero.context.annotation.ComponentScanDetector;
+import org.springframework.zero.autoconfigure.ComponentScanDetector;
 
 /**
  * Simple configuration to import {@link ComponentScanDetector} for tests.

spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java

@@ -23,13 +23,13 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration;
 import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.zero.autoconfigure.data.JpaRepositoriesAutoConfiguration;
 import org.springframework.zero.autoconfigure.data.test.City;
 import org.springframework.zero.autoconfigure.data.test.CityRepository;
 import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
 import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
-import org.springframework.zero.context.annotation.ComponentScanDetectorConfiguration;
 
 import static org.junit.Assert.assertNotNull;
 

spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

@@ -22,12 +22,12 @@ import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration;
 import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
 import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.zero.autoconfigure.orm.jpa.test.City;
-import org.springframework.zero.context.annotation.ComponentScanDetectorConfiguration;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.zero.SpringApplication;
 import org.springframework.zero.actuate.properties.SecurityProperties;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 @EnableAutoConfiguration
 @ComponentScan

spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java

@@ -19,7 +19,7 @@ package org.springframework.zero.sample.actuator;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 @Configuration

spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java

@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 @Configuration
 @EnableAutoConfiguration

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java

@@ -19,7 +19,7 @@ package org.springframework.zero.sample.data.jpa;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 @Configuration
 @ComponentScan

spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java

@@ -20,7 +20,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 @Configuration

spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java

@@ -19,7 +19,7 @@ package org.springframework.zero.sample.jetty;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 @Configuration
 @EnableAutoConfiguration

spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java

@@ -21,7 +21,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.CommandLineRunner;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.sample.profile.service.MessageService;
 
 @Configuration

spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java

@@ -21,7 +21,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.CommandLineRunner;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 import org.springframework.zero.sample.simple.service.HelloWorldService;
 
 @Configuration

spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java

@@ -19,7 +19,7 @@ package org.springframework.zero.sample.tomcat;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 @Configuration
 @EnableAutoConfiguration

spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java

@@ -19,7 +19,7 @@ package org.springframework.zero.sample.traditional;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 @Configuration
 @EnableAutoConfiguration

spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java

@@ -21,7 +21,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.annotation.EnableAutoConfiguration;
+import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
 
 @Configuration
 @EnableAutoConfiguration