Switch to new versioning scheme.

Closes gh-558.

README.adoc

@@ -48,8 +48,9 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.vault</groupId>
   <artifactId>spring-vault-core</artifactId>
-  <version>${version}.RELEASE</version>
+  <version>${version}</version>
 </dependency>
+----
 ====
 
 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
 <dependency>
   <groupId>org.springframework.vault</groupId>
   <artifactId>spring-vault</artifactId>
-  <version>${version}.BUILD-SNAPSHOT</version>
+  <version>${version}-SNAPSHOT</version>
 </dependency>
 
 <repository>
@@ -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.
 ----
 

pom.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.vault</groupId>
 	<artifactId>spring-vault-parent</artifactId>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.3.0-SNAPHSOT</version>
 
 	<name>Spring Vault</name>
 	<description>Parent project for Spring Vault</description>
@@ -108,7 +110,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-dependencies</artifactId>
-				<version>2.3.0.BUILD-SNAPSHOT</version>
+				<version>2.3.0-SNAPSHOT</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -552,7 +554,7 @@
 			<id>springNext</id>
 
 			<properties>
-				<spring.version>5.2.5.BUILD-SNAPSHOT</spring.version>
+				<spring.version>5.3.0-SNAPSHOT</spring.version>
 			</properties>
 
 			<repositories>

spring-vault-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.vault</groupId>
 		<artifactId>spring-vault-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0-SNAPHSOT</version>
 	</parent>
 
 	<artifactId>spring-vault-core</artifactId>

spring-vault-dependencies/pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.springframework.vault</groupId>
 	<artifactId>spring-vault-dependencies</artifactId>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>spring-vault-dependencies</name>
@@ -77,7 +77,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-core</artifactId>
-				<version>2.3.0.BUILD-SNAPSHOT</version>
+				<version>2.3.0-SNAPHSOT</version>
 			</dependency>
 
 			<dependency>

spring-vault-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.vault</groupId>
 		<artifactId>spring-vault-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0-SNAPHSOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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
 `<dependencyManagement />` section of your `pom.xml`:
 
 .Using the Spring Vault BOM
 ====
-[source, xml, subs="verbatim,attributes"]
+[source,xml,subs="verbatim,attributes"]
 ----
 <dependencyManagement>
   <dependencies>
@@ -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]
 ----
 <dependencies>
     <dependency>
@@ -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.