diff --git a/README.adoc b/README.adoc index 1451c870..ab268416 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,4 @@ -//// -DO NOT EDIT THIS FILE. IT WAS GENERATED. -Manual changes to this file will be lost when it is generated again. -Edit the files in the src/main/asciidoc/ directory instead. -//// +// Do not edit this file (e.g. go instead to src/main/asciidoc) :docs: https://cloud.spring.io/spring-cloud-vault/spring-cloud-vault.html @@ -331,7 +327,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, @@ -520,7 +516,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/ ---- @@ -561,8 +556,8 @@ 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-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/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`. -IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. \ No newline at end of file +IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. diff --git a/docs/pom.xml b/docs/pom.xml index 68a3db46..57b427ee 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,12 +7,12 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-vault-config-docs - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Vault Config Docs diff --git a/pom.xml b/pom.xml index b0bdf2f6..9aeb30f7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.1.9.RELEASE + 2.1.8.BUILD-SNAPSHOT spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Vault @@ -42,7 +42,7 @@ UTF-8 - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT 4.5.5 4.4.9 3.10.0 diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index d62178cb..fd57a14e 100644 --- a/spring-cloud-starter-vault-config/pom.xml +++ b/spring-cloud-starter-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 77bd0fd7..025deb6e 100644 --- a/spring-cloud-vault-config-aws/pom.xml +++ b/spring-cloud-vault-config-aws/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index aa7ba5c4..8dc473a8 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 172f4407..5b7938a2 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index bbcb20da..278211f6 100644 --- a/spring-cloud-vault-config-rabbitmq/pom.xml +++ b/spring-cloud-vault-config-rabbitmq/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 1ccf6bc9..b07af359 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 881dd666..678a11bb 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.1.9.RELEASE + 2.1.8.BUILD-SNAPSHOT spring-cloud-vault-dependencies - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Vault Dependencies