From 9a32729298df4fdcd17d021d7ee0fa1b582b7070 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 18:47:46 +0000 Subject: [PATCH] Going back to snapshots --- README.adoc | 3 +-- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- .../server/RefreshableConfigServerIntegrationTests.java | 6 +++--- spring-cloud-starter-config/pom.xml | 4 ++-- 10 files changed, 17 insertions(+), 18 deletions(-) diff --git a/README.adoc b/README.adoc index a8a1e531..d525e0f9 100644 --- a/README.adoc +++ b/README.adoc @@ -257,7 +257,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://docs.docker.com/compose/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -459,7 +459,6 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. -The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docs/pom.xml b/docs/pom.xml index ccef79c2..7ad3a377 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 3bea621c..0fdca409 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT @@ -27,7 +27,7 @@ config - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT true true diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 1760c9a3..a14c6fb8 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.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 9418d87f..97d80182 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT spring-cloud-config-dependencies - 2.1.4.RELEASE + 2.1.4.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 2351394e..4a77b3d4 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 2.1.3.RELEASE + 2.1.1.BUILD-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 60a1e99e..4b47428b 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 9428b934..51663ebf 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/RefreshableConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/RefreshableConfigServerIntegrationTests.java index 10991e44..ebc59d8d 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/RefreshableConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/RefreshableConfigServerIntegrationTests.java @@ -79,9 +79,9 @@ public class RefreshableConfigServerIntegrationTests { } /* - * We're emulating an application "foo" which is running with the "development" - * profile and is asking for its properties using the REST endpoint. We're also - * calling the /env & /refresh actuator endpoints to change the + * We're emulating an application "foo" which is running with the "development" profile + * and is asking for its properties using the REST endpoint. We're also calling the + * /env & /refresh actuator endpoints to change the * `spring.cloud.config.server.overrides.foo` property. Since we see that we only get * the overridden "foo" property after the context refresh we are sure that the * properties have been set and the EnvironmentController bean has successfully been diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 35104983..aedadef5 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT spring-cloud-starter-config - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud