From c6778672d6cda503bba9522a5dd09aac52a8f800 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Nov 2019 14:45:16 +0000 Subject: [PATCH] Update SNAPSHOT to 2.1.5.RELEASE --- README.adoc | 5 +++-- 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, 19 insertions(+), 18 deletions(-) diff --git a/README.adoc b/README.adoc index d525e0f9..4bace665 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://compose.docker.io/[Docker Compose] to run the middeware servers +https://docs.docker.com/compose/[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,6 +459,7 @@ $ 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/ ---- @@ -499,7 +500,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: -- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. +- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. diff --git a/docs/pom.xml b/docs/pom.xml index f9314bb8..a69752e2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/pom.xml b/pom.xml index 5d30012f..31fc6e46 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.1.8.BUILD-SNAPSHOT + 2.1.9.RELEASE @@ -27,7 +27,7 @@ config - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE true true diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 98e8fec4..06b0cfff 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 53f5608d..ac506389 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.8.BUILD-SNAPSHOT + 2.1.9.RELEASE spring-cloud-config-dependencies - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE 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 495ca478..c3a57688 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 6eaf8414..d6e04293 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 9b89c0af..bab69c33 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. 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 ebc59d8d..10991e44 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 166486b7..c75102b7 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE spring-cloud-starter-config - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud