diff --git a/gemfire-spring-boot-starter/gemfire-spring-boot-starter.gradle b/gemfire-spring-boot/gemfire-spring-boot.gradle similarity index 84% rename from gemfire-spring-boot-starter/gemfire-spring-boot-starter.gradle rename to gemfire-spring-boot/gemfire-spring-boot.gradle index b725bae4..4f9629eb 100644 --- a/gemfire-spring-boot-starter/gemfire-spring-boot-starter.gradle +++ b/gemfire-spring-boot/gemfire-spring-boot.gradle @@ -6,7 +6,7 @@ description = "Spring Boot for Pivotal GemFire" dependencies { - compile(project(':geode-spring-boot-starter')) { + compile(project(':geode-spring-boot')) { exclude group: "org.springframework.data", module: "spring-data-geode" } diff --git a/geode-spring-boot-starter/geode-spring-boot-starter.gradle b/geode-spring-boot/geode-spring-boot.gradle similarity index 100% rename from geode-spring-boot-starter/geode-spring-boot-starter.gradle rename to geode-spring-boot/geode-spring-boot.gradle diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java b/geode-spring-boot/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java rename to geode-spring-boot/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/data/gemfire/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java b/geode-spring-boot/src/main/java/org/springframework/data/gemfire/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/data/gemfire/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java rename to geode-spring-boot/src/main/java/org/springframework/data/gemfire/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java b/geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java rename to geode-spring-boot/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java b/geode-spring-boot/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java rename to geode-spring-boot/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java b/geode-spring-boot/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java rename to geode-spring-boot/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java b/geode-spring-boot/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java rename to geode-spring-boot/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java b/geode-spring-boot/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java rename to geode-spring-boot/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java b/geode-spring-boot/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java rename to geode-spring-boot/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/Service.java b/geode-spring-boot/src/main/java/org/springframework/geode/core/env/support/Service.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/Service.java rename to geode-spring-boot/src/main/java/org/springframework/geode/core/env/support/Service.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/User.java b/geode-spring-boot/src/main/java/org/springframework/geode/core/env/support/User.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/User.java rename to geode-spring-boot/src/main/java/org/springframework/geode/core/env/support/User.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/util/ObjectUtils.java b/geode-spring-boot/src/main/java/org/springframework/geode/core/util/ObjectUtils.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/core/util/ObjectUtils.java rename to geode-spring-boot/src/main/java/org/springframework/geode/core/util/ObjectUtils.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java b/geode-spring-boot/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java rename to geode-spring-boot/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java b/geode-spring-boot/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java rename to geode-spring-boot/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java b/geode-spring-boot/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java similarity index 100% rename from geode-spring-boot-starter/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java rename to geode-spring-boot/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java diff --git a/geode-spring-boot-starter/src/main/resources/META-INF/spring.factories b/geode-spring-boot/src/main/resources/META-INF/spring.factories similarity index 100% rename from geode-spring-boot-starter/src/main/resources/META-INF/spring.factories rename to geode-spring-boot/src/main/resources/META-INF/spring.factories diff --git a/geode-spring-boot-starter/src/test/java/example/app/NonBeanType.java b/geode-spring-boot/src/test/java/example/app/NonBeanType.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/app/NonBeanType.java rename to geode-spring-boot/src/test/java/example/app/NonBeanType.java diff --git a/geode-spring-boot-starter/src/test/java/example/app/model/Author.java b/geode-spring-boot/src/test/java/example/app/model/Author.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/app/model/Author.java rename to geode-spring-boot/src/test/java/example/app/model/Author.java diff --git a/geode-spring-boot-starter/src/test/java/example/app/model/Book.java b/geode-spring-boot/src/test/java/example/app/model/Book.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/app/model/Book.java rename to geode-spring-boot/src/test/java/example/app/model/Book.java diff --git a/geode-spring-boot-starter/src/test/java/example/app/model/ISBN.java b/geode-spring-boot/src/test/java/example/app/model/ISBN.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/app/model/ISBN.java rename to geode-spring-boot/src/test/java/example/app/model/ISBN.java diff --git a/geode-spring-boot-starter/src/test/java/example/app/repo/BookRepository.java b/geode-spring-boot/src/test/java/example/app/repo/BookRepository.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/app/repo/BookRepository.java rename to geode-spring-boot/src/test/java/example/app/repo/BookRepository.java diff --git a/geode-spring-boot-starter/src/test/java/example/app/service/BookService.java b/geode-spring-boot/src/test/java/example/app/service/BookService.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/app/service/BookService.java rename to geode-spring-boot/src/test/java/example/app/service/BookService.java diff --git a/geode-spring-boot-starter/src/test/java/example/app/service/support/CachingBookService.java b/geode-spring-boot/src/test/java/example/app/service/support/CachingBookService.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/app/service/support/CachingBookService.java rename to geode-spring-boot/src/test/java/example/app/service/support/CachingBookService.java diff --git a/geode-spring-boot-starter/src/test/java/example/echo/config/EchoClientConfiguration.java b/geode-spring-boot/src/test/java/example/echo/config/EchoClientConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/echo/config/EchoClientConfiguration.java rename to geode-spring-boot/src/test/java/example/echo/config/EchoClientConfiguration.java diff --git a/geode-spring-boot-starter/src/test/java/example/echo/config/EchoServerConfiguration.java b/geode-spring-boot/src/test/java/example/echo/config/EchoServerConfiguration.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/echo/config/EchoServerConfiguration.java rename to geode-spring-boot/src/test/java/example/echo/config/EchoServerConfiguration.java diff --git a/geode-spring-boot-starter/src/test/java/example/geode/cache/EchoCacheLoader.java b/geode-spring-boot/src/test/java/example/geode/cache/EchoCacheLoader.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/geode/cache/EchoCacheLoader.java rename to geode-spring-boot/src/test/java/example/geode/cache/EchoCacheLoader.java diff --git a/geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReading.java b/geode-spring-boot/src/test/java/example/geode/query/cq/event/TemperatureReading.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReading.java rename to geode-spring-boot/src/test/java/example/geode/query/cq/event/TemperatureReading.java diff --git a/geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java b/geode-spring-boot/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java rename to geode-spring-boot/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java diff --git a/geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureUnit.java b/geode-spring-boot/src/test/java/example/geode/query/cq/event/TemperatureUnit.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureUnit.java rename to geode-spring-boot/src/test/java/example/geode/query/cq/event/TemperatureUnit.java diff --git a/geode-spring-boot-starter/src/test/java/example/java/net/UrlRevealed.java b/geode-spring-boot/src/test/java/example/java/net/UrlRevealed.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/example/java/net/UrlRevealed.java rename to geode-spring-boot/src/test/java/example/java/net/UrlRevealed.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java b/geode-spring-boot/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java rename to geode-spring-boot/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java b/geode-spring-boot/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java similarity index 100% rename from geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java rename to geode-spring-boot/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java diff --git a/geode-spring-boot-starter/src/test/resources/application-security-cloud.properties b/geode-spring-boot/src/test/resources/application-security-cloud.properties similarity index 100% rename from geode-spring-boot-starter/src/test/resources/application-security-cloud.properties rename to geode-spring-boot/src/test/resources/application-security-cloud.properties diff --git a/geode-spring-boot-starter/src/test/resources/application-security-local-client.properties b/geode-spring-boot/src/test/resources/application-security-local-client.properties similarity index 100% rename from geode-spring-boot-starter/src/test/resources/application-security-local-client.properties rename to geode-spring-boot/src/test/resources/application-security-local-client.properties diff --git a/geode-spring-boot-starter/src/test/resources/application-security-local-server.properties b/geode-spring-boot/src/test/resources/application-security-local-server.properties similarity index 100% rename from geode-spring-boot-starter/src/test/resources/application-security-local-server.properties rename to geode-spring-boot/src/test/resources/application-security-local-server.properties diff --git a/geode-spring-boot-starter/src/test/resources/application-ssl.properties b/geode-spring-boot/src/test/resources/application-ssl.properties similarity index 100% rename from geode-spring-boot-starter/src/test/resources/application-ssl.properties rename to geode-spring-boot/src/test/resources/application-ssl.properties diff --git a/geode-spring-boot-starter/src/test/resources/application-vcap.properties b/geode-spring-boot/src/test/resources/application-vcap.properties similarity index 100% rename from geode-spring-boot-starter/src/test/resources/application-vcap.properties rename to geode-spring-boot/src/test/resources/application-vcap.properties diff --git a/geode-spring-boot-starter/src/test/resources/test-trusted.keystore b/geode-spring-boot/src/test/resources/test-trusted.keystore similarity index 100% rename from geode-spring-boot-starter/src/test/resources/test-trusted.keystore rename to geode-spring-boot/src/test/resources/test-trusted.keystore