From 0ca0d4f8e04439b533a623a3ef6075d425e8d930 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Nov 2019 15:14:41 +0000 Subject: [PATCH] Update SNAPSHOT to 2.1.4.RELEASE --- README.adoc | 5 +++-- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 14 files changed, 23 insertions(+), 22 deletions(-) diff --git a/README.adoc b/README.adoc index e813995a..d14de98a 100644 --- a/README.adoc +++ b/README.adoc @@ -83,7 +83,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, @@ -273,6 +273,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/ ---- @@ -313,7 +314,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 ba860451..18da6eb0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index a6368a10..64c0dc65 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 2.1.8.BUILD-SNAPSHOT + 2.1.9.RELEASE - 2.1.4.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE + 2.1.4.RELEASE + 2.1.5.RELEASE + 2.1.4.RELEASE 1.0.3.RELEASE - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE Fishtown.SR4 true diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index a1795b52..f941819c 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 120d72f0..5669be3e 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 2706bddb..6e5e7c82 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 8f5e2e03..6c5557ae 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-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-consul-dependencies - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 93dd153e..fe5a7c33 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index d1f7879d..a2b58356 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 592ec86c..86db402d 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index bd6c6b73..7bb14a33 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 55a3e457..f4c4f8b7 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 980d6761..4fb679e3 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index bf3b757e..ba02221c 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul