diff --git a/README.adoc b/README.adoc index 4e13b310..d3337175 100644 --- a/README.adoc +++ b/README.adoc @@ -48,8 +48,9 @@ Add the Maven dependency: org.springframework.vault spring-vault-core - ${version}.RELEASE + ${version} +---- ==== If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version. @@ -60,7 +61,7 @@ If you'd rather like the latest snapshots of the upcoming major version, use our org.springframework.vault spring-vault - ${version}.BUILD-SNAPSHOT + ${version}-SNAPSHOT @@ -124,11 +125,11 @@ Key 5: b2898fc8130929d569c1677ee69dc5f3be57d7c4b494a6062693ce0b1c4d93d805 Initial Root Token: 19aefa97-cccc-bbbb-aaaa-225940e63d76 Vault initialized with 5 keys and a key threshold of 3. Please -securely distribute the above keys. When the Vault is re-sealed, +securely distribute the above keys.When the Vault is re-sealed, restarted, or stopped, you must provide at least 3 of these keys to unseal it again. -Vault does not store the master key. Without at least 3 keys, +Vault does not store the master key.Without at least 3 keys, your Vault will remain permanently sealed. ---- diff --git a/pom.xml b/pom.xml index d24a4fd2..b7e50ab6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 org.springframework.vault spring-vault-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.0-SNAPHSOT Spring Vault Parent project for Spring Vault @@ -108,7 +110,7 @@ org.springframework.vault spring-vault-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.0-SNAPSHOT import pom @@ -552,7 +554,7 @@ springNext - 5.2.5.BUILD-SNAPSHOT + 5.3.0-SNAPSHOT diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml index 916118e7..e16e28e9 100644 --- a/spring-vault-core/pom.xml +++ b/spring-vault-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.vault spring-vault-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.0-SNAPHSOT spring-vault-core diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml index faa18c47..76c447ae 100644 --- a/spring-vault-dependencies/pom.xml +++ b/spring-vault-dependencies/pom.xml @@ -4,7 +4,7 @@ org.springframework.vault spring-vault-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.0-SNAPSHOT pom spring-vault-dependencies @@ -77,7 +77,7 @@ org.springframework.vault spring-vault-core - 2.3.0.BUILD-SNAPSHOT + 2.3.0-SNAPHSOT diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml index efb84fa7..56b94060 100644 --- a/spring-vault-distribution/pom.xml +++ b/spring-vault-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.vault spring-vault-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.0-SNAPHSOT ../pom.xml diff --git a/src/main/asciidoc/reference/dependencies.adoc b/src/main/asciidoc/reference/dependencies.adoc index c8609a1e..64d521b7 100644 --- a/src/main/asciidoc/reference/dependencies.adoc +++ b/src/main/asciidoc/reference/dependencies.adoc @@ -1,14 +1,13 @@ [[dependencies]] == Dependencies -The easiest way to find compatible versions of Spring Vault dependencies -is by relying on the Spring Vault BOM we ship with the compatible versions -defined. In a Maven project you would declare this dependency in the +The easiest way to find compatible versions of Spring Vault dependencies is by relying on the Spring Vault BOM we ship with the compatible versions defined. +In a Maven project you would declare this dependency in the `` section of your `pom.xml`: .Using the Spring Vault BOM ==== -[source, xml, subs="verbatim,attributes"] +[source,xml,subs="verbatim,attributes"] ---- @@ -25,18 +24,16 @@ defined. In a Maven project you would declare this dependency in the ==== [[dependencies.names]] -The current version is `{version}`. The version name follows the following -pattern: `$\{version\}-$\{release\}` where release can be one of the following: +The current version is `{version}`. +The version name follows the following patterns: `$\{version\}` for GA and service releases and `$\{version\}-$\{release\}` for snapshots and milestones. `release` can be one of the following: -* `BUILD-SNAPSHOT` - current snapshots +* `SNAPSHOT` - current snapshots * `M1`, `M2` etc. - milestones * `RC1`, `RC2` etc. - release candidates -* `RELEASE` - GA release -* `SR1`, `SR2` etc. - service releases .Declaring a dependency to Spring Vault ==== -[source, xml] +[source,xml] ---- @@ -50,7 +47,7 @@ pattern: `$\{version\}-$\{release\}` where release can be one of the following: [[dependencies.spring-framework]] == Spring Framework -The current version of Spring Vault requires Spring Framework in version -{springVersion} or better. The modules might also work with an older bugfix -version of that minor version. However, using the most recent version -within that generation is highly recommended. +The current version of Spring Vault requires Spring Framework in version +{springVersion} or better. +The modules might also work with an older bugfix version of that minor version. +However, using the most recent version within that generation is highly recommended.