SWS-1055 - Perform releases through Concourse.

Author: gregturn

README.adoc

@@ -72,29 +72,6 @@ This will generate the artifacts.
 
 You can also import the project into your IDE.
 
-== Releasing Spring Web Services
-
-Snapshots are published automatically via Concourse CI. (See the `ci` folder for details).
-
-IMPORTANT: Snapshots do NOT include GPG signatures. To do so would require putting a private key on the CI server. The process for releases (below) is manual and DOES include GPG signatures.
-
-To do a release (.RELEASE, .RC?, .M?):
-
-. Check in all changes and ensure there are no edited files.
-. Bump up the version in ALL `pom.xml` files to the desired version (e.g. `mvn versions:set -DnewVersion=3.0.0.RC1`) and commit the change.
-. `git tag <version>` (like v3.0.0.RC1)
-. Execute a maven test (`./mvnw -Pdistribute,snapshot,docs clean test`).
-. Execute a maven deploy.
-* For a milestone: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,milestone,docs clean -Dmaven.test.skip=true deploy`
-* For a release: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,release,docs clean -Dmaven.test.skip=true deploy`
-* For a release to maven central: `USERNAME=<user> PASSWORD=<nexus password> ./mvnw -Pdistribute,gpg,central clean -Dmaven.test.skip=true deploy -s settings.xml`
-. Bump up the version in ALL `pom.xml` files again to the next BUILD-SNAPSHOT.
-. Commit the change.
-. `git push` (This will push the tagged version along with the release AND the new snapshot commit)
-. Inspect handiwork at https://repo.spring.io/ or https://oss.sonatype.org/#stagingRepositories
-
-NOTE: A word about reference documentation. Based upon https://github.com/spring-projects/spring-framework/wiki/gradle-build-and-release-faq#user-content-wiki-docs_schema_dist_publication[this], the `distribute` profile contains an artifactory property that is applied to the ZIP file generated by the `docs` profile. A CRON job will scoop up the zipped up docs and unpack them inside the target location.
-
 == Code of Conduct
 
 This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].

ci/README.adoc

@@ -27,20 +27,28 @@ WARNING: Do NOT check this file into source control! If you'll check, `credentia
 With this in place, run the following `fly` commands to create pipelines:
 
 ----
-% fly -t <team-name> sp -p spring-ws -c ci/pipeline-template.yml -l credentials.yml -v branch=master
-% fly -t <team-name> sp -p spring-ws-2.x -c ci/pipeline-template.yml -l credentials.yml -v branch=2.x
+% fly -t spring-team sp -p spring-ws -c ci/pipeline-template.yml -l credentials.yml -v branch=master -v release-branch=release
 ----
 
-This creates pipelines for:
+With these pipelines in place, you can now activate and expose them:
 
-* Spring WS `master` branch
-* Spring WS `2.x` branch
+----
+% fly -t spring-team unpause-pipeline -p spring-ws
+% fly -t spring-team expose-pipeline -p spring-ws
+----
 
-With these pipelines in place, you can now activate and expose them:
+=== Making a release
 
+1. Create a new release (on the main branch).
+----
+% ci/create-release.sh <release version> <next snapshot version>
 ----
-% fly -t <team-name> unpause-pipeline -p spring-ws
-% fly -t <team-name> expose-pipeline -p spring-ws
-% fly -t <team-name> unpause-pipeline -p spring-ws-2.x
-% fly -t <team-name> expose-pipeline -p spring-ws-2.x
-----
+
+2. With the release tagged, push the tagged version to the release branch.
+----
+% git checkout -b release
+% git reset --hard <tag>
+% git push -f origin release
+----
+
+NOTE: You can chain the previous set of commands together using `&&`.

ci/create-release.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -euo pipefail
+
+RELEASE=$1
+SNAPSHOT=$2
+
+# Bump up the version in pom.xml to the desired version and commit the change
+./mvnw versions:set -DnewVersion=$RELEASE -DgenerateBackupPoms=false
+git add .
+git commit --message "Releasing Spring Web Services v$RELEASE"
+
+# Tag the release
+git tag -s v$RELEASE -m "v$RELEASE"
+
+# Bump up the version in pom.xml to the next snapshot
+./mvnw versions:set -DnewVersion=$SNAPSHOT -DgenerateBackupPoms=false
+git add .
+git commit --message "Continue development on v$SNAPSHOT"
+
+