From f9378b171b5f636e5f6c306bcd91153e38ff6d94 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Tue, 27 Nov 2018 11:38:34 -0600
Subject: [PATCH] Polish build procedures.

---
 README.adoc | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.adoc b/README.adoc
index ccc5d84..30a71ba 100644
--- a/README.adoc
+++ b/README.adoc
@@ -94,21 +94,31 @@ To do a release (.RELEASE, .RC?, .M?):
 . Check in all changes and ensure there are no edited files.
 . Run `ci/create-release.sh <release version> <snapshot version>` e.g. (`ci/create-release.sh 2.1.1.RELEASE 2.1.2.BUILD-SNAPSHOT`)
 
-To deploy your changes:
+From here, test things out locally.
 
 . `git checkout release`
-. Execute a maven deploy.
-* For a milestone: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,milestone,docs clean deploy`
-* For a release: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,release,docs clean deploy`
-* For a release to maven central: `USERNAME=<user> PASSWORD=<nexus password> ./mvnw -Pdistribute,gpg,central clean deploy -s settings.xml` (At SonaType, *close* and *releases*)
-. Inspect handiwork at https://repo.spring.io/ or https://oss.sonatype.org/#stagingRepositories
+. `./mvn clean package`
+. ...do all your testing...
 
-Once everything has been verified, push everything to origin:
+Once verified, push the `release` branch to `origin` and let the CI server deploy it.
 
 . `git push`
-. `git push --tags`
+
+After a clean release, switch back to master branch and push the master development branch.
+
 . `git checkout master`
 . `git push`
+. `git push --tags`
+
+//To deploy your changes:
+//
+//. `git checkout release`
+//. Execute a maven deploy.
+//* For a milestone: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,milestone,docs clean deploy`
+//* For a release: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,release,docs clean deploy`
+//* For a release to maven central: `USERNAME=<user> PASSWORD=<nexus password> ./mvnw -Pdistribute,gpg,central clean deploy -s settings.xml` (At SonaType, *close* and *releases*)
+//. Inspect handiwork at https://repo.spring.io/ or https://oss.sonatype.org/#stagingRepositories
+
 
 CI server should build the new snapshot and automatically deploy to artifactory.