From 171d2b261b8fe8ffff4cbd6d364eddbae311e935 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 12 Dec 2016 09:26:34 -0700 Subject: [PATCH] Update to s-c-build 1.3.0 and bump version to 1.3.0 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- .../src/test/java/sample/ApplicationTests.java | 5 +++-- spring-cloud-config-server/pom.xml | 2 +- .../config/server/NativeConfigServerIntegrationTests.java | 2 +- .../server/SubversionConfigServerIntegrationTests.java | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 11 files changed, 16 insertions(+), 15 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ff6fb294..a03d8a2b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT pom Spring Cloud Config Docs diff --git a/pom.xml b/pom.xml index 70351dea..86b1f176 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index f27b03be..5817b46b 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 - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index b479ae7b..2c128d4e 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 - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT spring-cloud-config-dependencies - 1.2.3.BUILD-SNAPSHOT + 1.3.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 e9b6dc67..e154b441 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 - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 5514e1bc..113c6933 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 - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java index 90cc3eec..91aeb8af 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java @@ -9,8 +9,8 @@ import org.junit.runner.RunWith; import org.springframework.boot.SpringApplication; import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; import org.springframework.boot.context.embedded.LocalServerPort; -import org.springframework.boot.test.TestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.junit4.SpringRunner; @@ -22,7 +22,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @SpringBootTest(classes = Application.class, // Normally spring.cloud.config.enabled:true is the default but since we have the config // server on the classpath we need to set it explicitly - properties = { "spring.cloud.config.enabled:true" }, webEnvironment = RANDOM_PORT) + properties = { "spring.cloud.config.enabled:true", + "management.security.enabled=false" }, webEnvironment = RANDOM_PORT) public class ApplicationTests { private static int configPort = 0; diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 5b8752ed..7c4454e7 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 - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java index a80d21bf..444d9f24 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java @@ -7,8 +7,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.embedded.LocalServerPort; -import org.springframework.boot.test.TestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; import org.springframework.http.HttpStatus; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java index 2e557aee..608fbe26 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.LocalServerPort; -import org.springframework.boot.test.TestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.environment.SvnKitEnvironmentRepository; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 9760a1c1..1a379652 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 - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT spring-cloud-starter-config - 1.2.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud