diff --git a/README.adoc b/README.adoc index bba08d7c..a9ec1fb1 100644 --- a/README.adoc +++ b/README.adoc @@ -32,7 +32,7 @@ Specifically for Spring applications: {docs}#vault.config.authentication.awsec2[AWS-EC2] authentication, {docs}#vault.config.authentication.awsiam[AWS-IAM] authentication, and {docs}#vault.config.authentication.kubernetes[Kubernetes] authentication. - +* Transmit data to Vault for encryption and decryption. * Bootstrap application context: a parent context for the main application that can be trained to do anything. @@ -331,7 +331,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 +520,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/ ---- @@ -565,4 +564,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t - `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 6e872498..9d0e17c3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,12 +7,12 @@ org.springframework.cloud spring-cloud-vault-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-vault-config-docs - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT pom Spring Cloud Vault Config Docs diff --git a/pom.xml b/pom.xml index 09a5e63e..dde56b29 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.2.0.M3 + 2.2.0.BUILD-SNAPSHOT spring-cloud-vault-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT pom Spring Cloud Vault @@ -42,7 +42,7 @@ UTF-8 - 2.2.0.M1 + 2.1.0.BUILD-SNAPSHOT 4.5.5 4.4.9 4.1.30.Final diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index 7764db51..2f85e717 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.2.0.M1 + 2.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 1365cbe0..0ee6a408 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.2.0.M1 + 2.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 81727494..7af5cd5b 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.2.0.M1 + 2.2.0.BUILD-SNAPSHOT .. @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 2.2.0.M1 + 2.1.0.BUILD-SNAPSHOT diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 301fb5b9..2f8c6a44 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.2.0.M1 + 2.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index ed405527..938a39ac 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.2.0.M1 + 2.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 4d523422..46a4aade 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.2.0.M1 + 2.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 16706dfe..4c19b2b1 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.2.0.M3 + 2.2.0.BUILD-SNAPSHOT spring-cloud-vault-dependencies - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT pom Spring Cloud Vault Dependencies