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 6fa3b494..6b7c2d86 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index 33774cc4..f9d1b87b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 2.1.10.BUILD-SNAPSHOT + 2.1.10.RELEASE - 2.1.5.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT - 2.1.6.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT + 2.1.4.RELEASE + 2.1.5.RELEASE + 2.1.6.RELEASE + 2.1.5.RELEASE 1.0.3.RELEASE - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE Fishtown.SR4 true diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 0bc6d380..7ad7dadd 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 2a5fbf0a..5a38c28e 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index dc66c700..ae8c57c5 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index bba540e9..d8375aae 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.10.BUILD-SNAPSHOT + 2.1.10.RELEASE spring-cloud-consul-dependencies - 2.1.5.BUILD-SNAPSHOT + 2.1.5.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 a502b816..548c5d09 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 38c2bc73..52887cc2 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 72a27303..c8c7e4a9 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.5.BUILD-SNAPSHOT + 2.1.5.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 ecfc4b38..04807136 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.5.BUILD-SNAPSHOT + 2.1.5.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 7dd9b955..e51afe63 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.5.BUILD-SNAPSHOT + 2.1.5.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 fc38c53f..cfa1258a 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 30565054..6db33c4a 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-starter-consul