diff --git a/README.adoc b/README.adoc index ab268416..1451c870 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,8 @@ -// Do not edit this file (e.g. go instead to src/main/asciidoc) +//// +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. +//// :docs: https://cloud.spring.io/spring-cloud-vault/spring-cloud-vault.html @@ -327,7 +331,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, @@ -516,6 +520,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/ ---- @@ -556,8 +561,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/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`. -IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. +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 diff --git a/docs/pom.xml b/docs/pom.xml index d2199ab0..879d96f1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,12 +7,12 @@ org.springframework.cloud spring-cloud-vault-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-vault-config-docs - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE pom Spring Cloud Vault Config Docs diff --git a/pom.xml b/pom.xml index 59ff1d9b..7cc9e5bd 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.1.10.BUILD-SNAPSHOT + 2.1.10.RELEASE spring-cloud-vault-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE pom Spring Cloud Vault @@ -42,7 +42,7 @@ UTF-8 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE 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 9f79153c..a097109f 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index ac0a433c..cfad50d6 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 518c7940..d0ac2d62 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 0311a1bf..d4fd63f0 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index e822b6ba..e9e973b1 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index e421f0a9..25a88e4a 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index b9a3fece..0cfa6227 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.10.BUILD-SNAPSHOT + 2.1.10.RELEASE spring-cloud-vault-dependencies - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE pom Spring Cloud Vault Dependencies