diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java index 9f116f61d8..a502a954e8 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/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; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java index 0a6eb7f392..f6562cb879 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/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; /** diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 2f7e2b91ee..44a61686f0 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/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; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java index 4e58c8f91f..6fc8c40d37 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/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; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index 6276e1fce3..cfed5aa9c9 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/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; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java index ffac0ce773..91c73d9dca 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/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; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index 198a5c2d96..ec3b14cc81 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/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; /** diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java index 0adf656542..27f7350fe6 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/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; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java index c3df801e05..ecdc89e308 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/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; /** diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index d11b986fe0..b4f8165783 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/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; /** diff --git a/spring-zero-actuator/src/main/resources/META-INF/spring.factories b/spring-zero-actuator/src/main/resources/META-INF/spring.factories index 61e36f9039..0448f3aa7b 100644 --- a/spring-zero-actuator/src/main/resources/META-INF/spring.factories +++ b/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,\ diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java similarity index 99% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java index dc1d31d1aa..78c328b760 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java similarity index 95% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java index 74d636f8d9..ba145a7f39 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java index e6ce10fa44..5dcbe71f22 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java +++ b/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 diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java similarity index 98% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java index 297d108857..7c98ac9016 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java similarity index 98% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java index c49e33449d..19ba4860ab 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java index 9b12d31318..5752c7f528 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java +++ b/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; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java index f30992d2f0..ba8f356fca 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/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; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java index 6619df74a3..23e4c7a9b8 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java index bd0c79b354..6993c5c6a1 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java index 7ff79f7010..11688f071b 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index 0db0698806..ef0c1b2045 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java index a1208565f4..1882c7eb36 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java +++ b/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. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index a6fb34e73c..57a5476a57 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/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; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java index 4047e8201b..1f04e3936a 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 15263e4518..ff4b7a46c5 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java index 2ff99895f0..f392c99eb0 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java index 56b955d5d7..618ce17e10 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java index 50d62ad19d..cbdc3f4d92 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java index 388fe7793f..7ab425327d 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java index 7695a544ab..ab6776e616 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java +++ b/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, diff --git a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories index aed5273ce0..5e294a113e 100644 --- a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/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,\ diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java similarity index 93% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java index 855927731a..b606b3d403 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java similarity index 87% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java index e35802a9bc..d906288817 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java +++ b/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. diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java index 75ec5efb88..d4cdb555f7 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/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; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 8d2460f637..fd7100294e 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/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; diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java index a06fd2b1d9..ae7c95711b 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java index 6fcebb6e6e..53d75618c9 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java index e0f11cb4e9..5c6113c7c8 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java index e24cfd367f..595a5d56c6 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java index 5b4cb80d4a..b1fab4e9eb 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java index fdce7ca4e1..2921133652 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java index 25eeacaddf..9846ac5f64 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java index 2381784c17..0119ea60cb 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java index 9de6c7b92d..66abcd2445 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java index bf42dcb910..a36d7c6bee 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java +++ b/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 diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java index 64c2957e6e..18c9bd4f2e 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java +++ b/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