Deploy releases directly to maven central.

To reduce risk of a release getting stuck in an intermediate state on bintray, make all official releases to maven central.

Author: gregturn

Jenkinsfile

@@ -26,6 +26,7 @@ pipeline {
 				}
 			}
 		}
+
 		stage("Test: baseline (jdk8)") {
 			agent {
 				docker {
@@ -37,6 +38,7 @@ pipeline {
 				sh "PROFILE=distribute,convergence ci/test.sh"
 			}
 		}
+
 		stage("Test other configurations") {
 			parallel {
 				stage("Test: spring-buildsnapshot (jdk8)") {
@@ -96,16 +98,21 @@ pipeline {
 				}
 			}
 		}
-		stage('Deploy to Artifactory') {
+
+		stage('Deploy') {
 			agent {
 				docker {
-					image 'adoptopenjdk/openjdk8:latest'
-					args '-v $HOME/.m2:/root/.m2'
+					image 'springci/spring-ws-openjdk8-with-jq:latest'
+					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
 				}
 			}
+			options { timeout(time: 20, unit: 'MINUTES') }
 
 			environment {
 				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				SONATYPE = credentials('oss-token')
+				KEYRING = credentials('spring-signing-secring.gpg')
+				PASSPHRASE = credentials('spring-gpg-passphrase')
 			}
 
 			steps {
@@ -115,94 +122,53 @@ pipeline {
 							returnStdout: true
 					).trim()
 
-					RELEASE_TYPE = 'snapshot'
-
 					if (PROJECT_VERSION.matches(/.*-RC[0-9]+$/) || PROJECT_VERSION.matches(/.*-M[0-9]+$/)) {
 						RELEASE_TYPE = "milestone"
 					} else if (PROJECT_VERSION.endsWith('SNAPSHOT')) {
 						RELEASE_TYPE = 'snapshot'
 					} else if (PROJECT_VERSION.matches(/.*\.[0-9]+$/)) {
 						RELEASE_TYPE = 'release'
+					} else {
+						RELEASE_TYPE = 'snapshot'
 					}
 
-					OUTPUT = sh(
-							script: "PROFILE=distribute,docs,${RELEASE_TYPE} ci/build.sh",
-							returnStdout: true
-					).trim()
-
-					echo "$OUTPUT"
-
-					build_info_path = OUTPUT.split('\n')
-							.find { it.contains('Artifactory Build Info Recorder') }
-							.split('Saving Build Info to ')[1]
-							.trim()[1..-2]
-
-					dir(build_info_path + '/..') {
-						stash name: 'build_info', includes: "*.json"
-					}
-				}
-			}
-		}
-		stage('Promote to Bintray') {
-			when {
-				branch 'release'
-			}
-			agent {
-				docker {
-					image 'springci/spring-ws-openjdk8-with-jq:latest'
-					args '-v $HOME/.m2:/root/.m2'
-				}
-			}
-
-			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-			}
-
-			steps {
-				script {
-					PROJECT_VERSION = sh(
-							script: "ci/version.sh",
-							returnStdout: true
-					).trim()
-
-					if (PROJECT_VERSION.matches(/.*\.[0-9]+$/)) {
-						unstash name: 'build_info'
-						sh "ci/promote-to-bintray.sh"
+					if (RELEASE_TYPE == 'release') {
+						sh "PROFILE=distribute,central USERNAME=${SONATYPE_USR} PASSWORD=${SONATYPE_PSW} ci/build-and-deploy-to-maven-central.sh ${PROJECT_VERSION}"
 					} else {
-						echo "${PROJECT_VERSION} is not a candidate for promotion to Bintray."
+						sh "PROFILE=distribute,${RELEASE_TYPE} ci/build-and-deploy-to-artifactory.sh"
 					}
 				}
 			}
 		}
-		stage('Sync to Maven Central') {
+
+		stage('Release documentation') {
 			when {
-				branch 'release'
+				anyOf {
+					branch 'master'
+					branch 'release'
+					branch 'issue/test-release'
+				}
 			}
 			agent {
 				docker {
-					image 'springci/spring-ws-openjdk8-with-jq:latest'
-					args '-v $HOME/.m2:/root/.m2'
+					image 'adoptopenjdk/openjdk8:latest'
+					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
 				}
 			}
+			options { timeout(time: 20, unit: 'MINUTES') }
 
 			environment {
-				BINTRAY = credentials('Bintray-spring-operator')
-				SONATYPE = credentials('oss-token')
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 			}
 
 			steps {
 				script {
-					PROJECT_VERSION = sh(
-							script: "ci/version.sh",
-							returnStdout: true
-					).trim()
-
-					if (PROJECT_VERSION.matches(/.*\.[0-9]+$/)) {
-						unstash name: 'build_info'
-						sh "ci/sync-to-maven-central.sh"
-					} else {
-						echo "${PROJECT_VERSION} is not a candidate for syncing to Maven Central."
-					}
+					sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pdistribute,docs ' +
+							'-Dartifactory.server=https://repo.spring.io ' +
+							"-Dartifactory.username=${ARTIFACTORY_USR} " +
+							"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+							"-Dartifactory.distribution-repository=temp-private-local " +
+							'-Dmaven.test.skip=true -Dmaven.deploy.skip=true deploy -B'
 				}
 			}
 		}

ci/Dockerfile

@@ -1,6 +1,6 @@
 FROM adoptopenjdk/openjdk8:latest
 
-RUN apt-get update && apt-get install -y jq
+RUN apt-get update && apt-get install -y jq gpg
 
 RUN apt-get clean \
  && rm -rf /var/lib/apt/lists/*

ci/build-and-deploy-to-artifactory.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -x
+
+set -euo pipefail
+
+#
+# Deploy the artifactory
+#
+echo 'Deploying to Artifactory...'
+
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
+  ./mvnw -P${PROFILE} -Dmaven.test.skip=true clean deploy -B

ci/build-and-deploy-to-maven-central.sh

@@ -0,0 +1,25 @@
+#!/bin/bash -x
+
+set -euo pipefail
+
+PROJECT_VERSION=$1
+
+#
+# Stage on Maven Central
+#
+echo 'Staging on Maven Central...'
+
+GNUPGHOME=/tmp/gpghome
+export GNUPGHOME
+
+mkdir $GNUPGHOME
+cp $KEYRING $GNUPGHOME
+
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
+    -s settings.xml \
+    -P${PROFILE} \
+    -Dmaven.test.skip=true \
+    -Dgpg.passphrase=${PASSPHRASE} \
+    -Dgpg.secretKeyring=${GNUPGHOME}/secring.gpg \
+    -DstagingDescription="Releasing ${PROJECT_VERSION}" \
+    clean deploy -B

ci/build.sh

@@ -2,4 +2,5 @@
 
 set -euo pipefail
 
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -P${PROFILE} clean dependency:list test -Dsort -B
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
+  ./mvnw -P${PROFILE} clean dependency:list test -Dsort -B

ci/promote-to-bintray.sh

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd">
+	<id>docs</id>
+	<formats>
+		<format>dir</format>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<!--
+				Adds reference manual (html and pdf) to the distribution archive
+				under the 'docs/reference' directory see pom.xml 'maven-javadoc-plugin' declaration.
+			-->
+			<directory>target/site/reference</directory>
+			<outputDirectory>reference</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<!--
+				Adds javadoc html to the distribution archive under the 'docs/javadoc'
+				directory see pom.xml 'maven-javadoc-plugin' declaration.
+			-->
+			<directory>target/site/apidocs</directory>
+			<outputDirectory>api</outputDirectory>
+		</fileSet>
+	</fileSets>
+</assembly>