diff --git a/docs/pom.xml b/docs/pom.xml index dc449d9d..c5c7a55f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index b5b45cde..b06fe3e0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT @@ -22,7 +22,7 @@ config - 2.0.1.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT spring-cloud-config-dependencies diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 57207eee..adeff2e2 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java index ed75bac1..72f4fb85 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java @@ -65,7 +65,7 @@ public class ConfigClientAutoConfiguration { protected static class ConfigServerHealthIndicatorConfiguration { @Bean - public ConfigServerHealthIndicator configServerHealthIndicator( + public ConfigServerHealthIndicator clientConfigServerHealthIndicator( ConfigServicePropertySourceLocator locator, ConfigClientHealthProperties properties, Environment environment) { return new ConfigServerHealthIndicator(locator, environment, properties); diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/BaseDiscoveryClientConfigServiceBootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/BaseDiscoveryClientConfigServiceBootstrapConfigurationTests.java index 858eaaf8..088c34d8 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/BaseDiscoveryClientConfigServiceBootstrapConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/BaseDiscoveryClientConfigServiceBootstrapConfigurationTests.java @@ -9,7 +9,7 @@ import org.junit.rules.ExpectedException; import org.mockito.Mockito; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; @@ -112,8 +112,8 @@ public abstract class BaseDiscoveryClientConfigServiceBootstrapConfigurationTest void setup(String... env) { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, env); - EnvironmentTestUtils.addEnvironment(this.context, "eureka.client.enabled=false"); + TestPropertyValues.of(env).applyTo(this.context); + TestPropertyValues.of("eureka.client.enabled=false").applyTo(this.context); this.context.getDefaultListableBeanFactory().registerSingleton("discoveryClient", this.client); this.context.register(UtilAutoConfiguration.class, diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java index 689e515a..6e7d5038 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java @@ -17,7 +17,7 @@ package org.springframework.cloud.config.client; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.cloud.config.client.ConfigClientProperties.Credentials; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; @@ -122,7 +122,7 @@ public class ConfigClientPropertiesTests { public void changeNameInOverride() { locator.setName("one"); ConfigurableEnvironment environment = new StandardEnvironment(); - EnvironmentTestUtils.addEnvironment(environment, "spring.application.name:two"); + TestPropertyValues.of("spring.application.name:two").applyTo(environment); ConfigClientProperties override = locator.override(environment); assertEquals("two", override.getName()); } diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfigurationTest.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfigurationTest.java index fa9edb7b..45e29e0a 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfigurationTest.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfigurationTest.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -54,7 +54,7 @@ public class ConfigServiceBootstrapConfigurationTest { @Test public void overrideConfigServicePropertySourceLocatorWhenBeanIsProvided() { - EnvironmentTestUtils.addEnvironment(this.context, "spring.cloud.config.enabled=true"); + TestPropertyValues.of("spring.cloud.config.enabled=true").applyTo(this.context); this.context.register(ConfigServicePropertySourceLocatorOverrideConfig.class); this.context.register(ConfigServiceBootstrapConfiguration.class); this.context.refresh(); diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java index c5e6021f..f24cc872 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java @@ -1,10 +1,5 @@ package org.springframework.cloud.config.client; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - import java.io.ByteArrayInputStream; import java.net.URI; import java.util.HashMap; @@ -12,13 +7,13 @@ import java.util.Iterator; import java.util.Map; import org.hamcrest.core.IsInstanceOf; -import org.hamcrest.core.IsNull; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Matchers; import org.mockito.Mockito; -import org.springframework.boot.test.util.EnvironmentTestUtils; + +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator.GenericRequestHeaderInterceptor; import org.springframework.cloud.config.environment.Environment; import org.springframework.core.env.ConfigurableEnvironment; @@ -34,12 +29,14 @@ import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.mock.http.client.MockClientHttpRequest; import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.springframework.cloud.config.client.ConfigClientProperties.AUTHORIZATION; public class ConfigServicePropertySourceLocatorTests { @@ -67,8 +64,8 @@ public class ConfigServicePropertySourceLocatorTests { Environment body = new Environment("app", "master"); mockRequestResponseWithLabel(new ResponseEntity<>(body, HttpStatus.OK), "v1.0.0"); this.locator.setRestTemplate(this.restTemplate); - EnvironmentTestUtils.addEnvironment(this.environment, - "spring.cloud.config.label:v1.0.0"); + TestPropertyValues.of("spring.cloud.config.label:v1.0.0") + .applyTo(this.environment); assertNotNull(this.locator.locate(this.environment)); } @@ -78,8 +75,8 @@ public class ConfigServicePropertySourceLocatorTests { mockRequestResponseWithLabel(new ResponseEntity<>(body, HttpStatus.OK), "release(_)v1.0.0"); this.locator.setRestTemplate(this.restTemplate); - EnvironmentTestUtils.addEnvironment(this.environment, - "spring.cloud.config.label:release/v1.0.0"); + TestPropertyValues.of("spring.cloud.config.label:release/v1.0.0") + .applyTo(this.environment); assertNotNull(this.locator.locate(this.environment)); } diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 1f607383..b19d03ed 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT spring-cloud-config-dependencies - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 105bcf5c..d7cb670d 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 128a54e7..7f5b78ab 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 890a4288..1d4fc454 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java index 538d7713..0dd474df 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java @@ -191,7 +191,7 @@ public class EnvironmentRepositoryConfiguration { } @Configuration -@ConditionalOnMissingBean(value = EnvironmentRepository.class, search = SearchStrategy.CURRENT) +@ConditionalOnMissingBean(value = EnvironmentRepository.class)//, search = SearchStrategy.CURRENT) class DefaultRepositoryConfiguration { @Autowired private ConfigurableEnvironment environment; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java index 1e155b36..7768f7ac 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java @@ -217,7 +217,7 @@ public class MultipleJGitEnvironmentRepositoryIntegrationTests { String defaultRepoUri = ConfigServerTestUtils.prepareLocalRepo("config-repo"); expected.expectCause(ThrowableMessageMatcher .hasMessage(containsString("Cannot write parent"))); - this.context = new SpringApplicationBuilder(TestConfiguration.class).web(false) + this.context = new SpringApplicationBuilder(TestConfiguration.class).web(WebApplicationType.NONE) .properties("spring.cloud.config.server.git.uri:" + defaultRepoUri, "spring.cloud.config.server.git.basedir:/tmp") .run(); diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index ad27bbad..b70f2a41 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -5,10 +5,10 @@ org.springframework.cloud spring-cloud-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT spring-cloud-starter-config - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud