Back to configure->config

The connectors project doesn't use any of the subpackages we do
here so if we movethe Environment and PropertySource into a sub-
package it should be safe.

See gh-91

spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java

@@ -20,9 +20,9 @@ import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.configure.client.ConfigClientProperties;
-import org.springframework.cloud.configure.client.ConfigServerHealthIndicator;
-import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigServerHealthIndicator;
+import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.cloud.configure.client.RefreshEndpoint;
+import org.springframework.cloud.config.client.RefreshEndpoint;
 import org.springframework.cloud.context.environment.EnvironmentManager;
 import org.springframework.cloud.context.environment.EnvironmentManagerMvcEndpoint;
 import org.springframework.cloud.context.restart.RestartEndpoint;

spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaD
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBindingPostProcessor;
 import org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration;
-import org.springframework.cloud.configure.client.RefreshEndpoint;
+import org.springframework.cloud.config.client.RefreshEndpoint;
 import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 import org.springframework.cloud.context.environment.EnvironmentManager;
 import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder;

spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java

@@ -29,9 +29,9 @@ import org.springframework.boot.bind.PropertySourcesPropertyValues;
 import org.springframework.boot.bind.RelaxedDataBinder;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
-import org.springframework.cloud.configure.client.ConfigClientProperties;
-import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator;
-import org.springframework.cloud.configure.client.PropertySourceLocator;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.config.client.PropertySourceLocator;
 import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 import org.springframework.cloud.logging.LoggingRebinder;
 import org.springframework.context.ApplicationContextInitializer;

spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java

@@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClas
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.bootstrap.encrypt.KeyProperties.KeyStore;
-import org.springframework.cloud.configure.encrypt.EncryptorFactory;
+import org.springframework.cloud.config.encrypt.EncryptorFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.client;
+package org.springframework.cloud.config.client;
 
 import java.net.MalformedURLException;
 import java.net.URL;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.client;
+package org.springframework.cloud.config.client;
 
 import java.util.ArrayList;
 import java.util.List;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.client;
+package org.springframework.cloud.config.client;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -22,8 +22,8 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.PropertySource;
+import org.springframework.cloud.config.source.Environment;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.MapPropertySource;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.client;
+package org.springframework.cloud.config.client;
 
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.client;
+package org.springframework.cloud.config.client;
 
 import java.util.Arrays;
 import java.util.Collection;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/EncryptorFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.encrypt;
+package org.springframework.cloud.config.encrypt;
 
 import org.springframework.security.crypto.encrypt.Encryptors;
 import org.springframework.security.crypto.encrypt.TextEncryptor;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/KeyFormatException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.encrypt;
+package org.springframework.cloud.config.encrypt;
 
 @SuppressWarnings("serial")
 public class KeyFormatException extends RuntimeException {

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/Environment.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure;
+package org.springframework.cloud.config.source;
 
 import java.util.ArrayList;
 import java.util.List;

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/PropertySource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure;
+package org.springframework.cloud.config.source;
 
 import java.util.Map;
 

spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java

@@ -6,8 +6,8 @@ import org.junit.Test;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration;
-import org.springframework.cloud.configure.client.ConfigClientProperties;
-import org.springframework.cloud.configure.client.ConfigServerHealthIndicator;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigServerHealthIndicator;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 

spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java

@@ -34,8 +34,8 @@ import org.junit.rules.ExpectedException;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.configure.client.ConfigClientProperties;
-import org.springframework.cloud.configure.client.PropertySourceLocator;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.PropertySourceLocator;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;

spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.client;
+package org.springframework.cloud.config.client;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.springframework.boot.test.EnvironmentTestUtils;
-import org.springframework.cloud.configure.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigClientProperties;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 

spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.client;
+package org.springframework.cloud.config.client;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -12,9 +12,9 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.client.ConfigClientProperties;
-import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.http.HttpEntity;

spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java

@@ -10,7 +10,7 @@ import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -37,7 +37,7 @@ public class ApplicationTests {
 		String baseDir = ConfigServerTestUtils.getBaseDirectory("spring-cloud-config-sample");
 		String repo = ConfigServerTestUtils.prepareLocalRepo(baseDir, "target/repos", "config-repo", "target/config");
 		server = SpringApplication.run(
-				org.springframework.cloud.configure.server.ConfigServerApplication.class,
+				org.springframework.cloud.config.server.ConfigServerApplication.class,
 				"--server.port=" + configPort, "--spring.config.name=server",
 				"--spring.cloud.config.server.git.uri=" + repo);
 		configPort = ((EmbeddedWebApplicationContext) server)

spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java

@@ -15,7 +15,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -41,7 +41,7 @@ public class ServerNativeApplicationTests {
 	public static void startConfigServer() throws IOException {
 		String repo = ConfigServerTestUtils.prepareLocalRepo();
 		server = SpringApplication.run(
-				org.springframework.cloud.configure.server.ConfigServerApplication.class,
+				org.springframework.cloud.config.server.ConfigServerApplication.class,
 				"--server.port=" + configPort, "--spring.config.name=server",
 				"--spring.cloud.config.server.git.uri=" + repo, "--spring.profiles.active=native");
 		configPort = ((EmbeddedWebApplicationContext) server)

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,8 +25,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.jgit.util.FileUtils;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.PropertySource;
+import org.springframework.cloud.config.source.Environment;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.UrlResource;
 import org.springframework.util.StringUtils;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerBootstrapConfiguration.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.configure.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigClientProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerMvcConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerProperties.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerTestUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import org.eclipse.jgit.util.FileUtils;
 import org.springframework.util.FileSystemUtils;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -29,10 +29,10 @@ import java.util.Map.Entry;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.PropertySource;
-import org.springframework.cloud.configure.encrypt.EncryptorFactory;
-import org.springframework.cloud.configure.encrypt.KeyFormatException;
+import org.springframework.cloud.config.encrypt.EncryptorFactory;
+import org.springframework.cloud.config.encrypt.KeyFormatException;
+import org.springframework.cloud.config.source.Environment;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,8 +13,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.bind.PropertiesConfigurationFactory;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.PropertySource;
+import org.springframework.cloud.config.source.Environment;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.http.HttpHeaders;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
-import org.springframework.cloud.configure.Environment;
+import org.springframework.cloud.config.source.Environment;
 
 
 /**

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.util.Map;
 
-import org.springframework.cloud.configure.PropertySource;
-import org.springframework.cloud.configure.client.PropertySourceLocator;
+import org.springframework.cloud.config.client.PropertySourceLocator;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,7 +40,7 @@ import org.eclipse.jgit.transport.OpenSshConfig.Host;
 import org.eclipse.jgit.transport.SshSessionFactory;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.eclipse.jgit.util.FileUtils;
-import org.springframework.cloud.configure.Environment;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.UrlResource;
 import org.springframework.util.Assert;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.configure.Environment;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.PatternMatchUtils;
 import org.springframework.util.StringUtils;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -24,8 +24,8 @@ import java.util.Set;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.PropertySource;
+import org.springframework.cloud.config.source.Environment;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.web.context.support.StandardServletEnvironment;
 
 /**

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.io.File;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.configure.Environment;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.util.Map;
 

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfigurati
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.config.ConfigFileApplicationListener;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.configure.Environment;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;

spring-cloud-config-server/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,3 @@
 # Bootstrap components
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.configure.server.ConfigServerBootstrapConfiguration
+org.springframework.cloud.config.server.ConfigServerBootstrapConfiguration

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerApplication;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.ConfigServerApplication;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -22,12 +22,12 @@ import static org.junit.Assert.assertTrue;
 import java.util.Collections;
 
 import org.junit.Test;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.PropertySource;
-import org.springframework.cloud.configure.encrypt.KeyFormatException;
-import org.springframework.cloud.configure.server.EncryptionController;
-import org.springframework.cloud.configure.server.InvalidCipherException;
-import org.springframework.cloud.configure.server.KeyNotInstalledException;
+import org.springframework.cloud.config.encrypt.KeyFormatException;
+import org.springframework.cloud.config.server.EncryptionController;
+import org.springframework.cloud.config.server.InvalidCipherException;
+import org.springframework.cloud.config.server.KeyNotInstalledException;
+import org.springframework.cloud.config.source.Environment;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.http.MediaType;
 import org.springframework.security.rsa.crypto.RsaSecretEncryptor;
 

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -27,8 +27,11 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.PropertySource;
+import org.springframework.cloud.config.server.EncryptionController;
+import org.springframework.cloud.config.server.EnvironmentController;
+import org.springframework.cloud.config.server.EnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
+import org.springframework.cloud.config.source.PropertySource;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,10 +30,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerConfiguration;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
-import org.springframework.cloud.configure.server.EnvironmentRepository;
+import org.springframework.cloud.config.server.ConfigServerConfiguration;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.EnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,9 +25,9 @@ import java.io.IOException;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
-import org.springframework.cloud.configure.server.JGitEnvironmentRepository;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.JGitEnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.core.env.StandardEnvironment;
 
 /**

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,10 +29,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerConfiguration;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
-import org.springframework.cloud.configure.server.EnvironmentRepository;
+import org.springframework.cloud.config.server.ConfigServerConfiguration;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.EnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 
@@ -23,10 +23,10 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
-import org.springframework.cloud.configure.server.MultipleJGitEnvironmentRepository;
-import org.springframework.cloud.configure.server.MultipleJGitEnvironmentRepository.PatternMatchingJGitEnvironmentRepository;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.MultipleJGitEnvironmentRepository;
+import org.springframework.cloud.config.server.MultipleJGitEnvironmentRepository.PatternMatchingJGitEnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.core.env.StandardEnvironment;
 
 /**

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -13,9 +13,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerApplication;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.ConfigServerApplication;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,10 +27,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerConfiguration;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
-import org.springframework.cloud.configure.server.EnvironmentRepository;
+import org.springframework.cloud.config.server.ConfigServerConfiguration;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.EnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import java.io.File;
 
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
-import org.springframework.cloud.configure.server.SVNKitEnvironmentRepository;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.SVNKitEnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.core.env.StandardEnvironment;
 
 import static org.junit.Assert.assertTrue;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.SpringApplicationEnvironmentRepository;
+import org.springframework.cloud.config.server.SpringApplicationEnvironmentRepository;
+import org.springframework.cloud.config.source.Environment;
 
 
 /**

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerApplication;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.ConfigServerApplication;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.configure.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.cloud.configure.Environment;
-import org.springframework.cloud.configure.server.ConfigServerApplication;
-import org.springframework.cloud.configure.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.server.ConfigServerApplication;
+import org.springframework.cloud.config.server.ConfigServerTestUtils;
+import org.springframework.cloud.config.source.Environment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;