diff --git a/Jenkinsfile b/Jenkinsfile index 5f7a92cf..3968dc59 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,6 +80,7 @@ pipeline { } agent { docker { + label 'data' image "${p['docker.image']}" args "${p['docker.java.inside.docker']}" registryUrl "${p['docker.proxy.registry']}" @@ -90,7 +91,7 @@ pipeline { environment { ARTIFACTORY = credentials("${p['artifactory.credentials']}") - SONATYPE = credentials('oss-s01-token') + CENTRAL_TOKEN = credentials('central-token') KEYRING = credentials('spring-signing-secring.gpg') PASSPHRASE = credentials('spring-gpg-passphrase') } diff --git a/ci/deploy-milestone.sh b/ci/deploy-milestone.sh index 61c43447..03e35c83 100755 --- a/ci/deploy-milestone.sh +++ b/ci/deploy-milestone.sh @@ -2,13 +2,16 @@ set -euo pipefail -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pci,milestone,artifactory,release \ - -Dartifactory.server=https://repo.spring.io \ - -Dartifactory.username=${ARTIFACTORY_USR} \ - -Dartifactory.password=${ARTIFACTORY_PSW} \ - -Dartifactory.staging-repository=libs-milestone-local \ - -Dartifactory.build-name=spring-vault \ - -Dartifactory.build-number=${BUILD_NUMBER} \ +GNUPGHOME=/tmp/gpghome +export GNUPGHOME + +mkdir $GNUPGHOME +cp $KEYRING $GNUPGHOME +chmod -R go-rwx $GNUPGHOME + +export MAVEN_GPG_PASSPHRASE="${PASSPHRASE}" + +MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pci,central,release \ clean deploy -U -B MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pdistribute \ diff --git a/ci/deploy-release.sh b/ci/deploy-release.sh index 5919982d..03e35c83 100755 --- a/ci/deploy-release.sh +++ b/ci/deploy-release.sh @@ -7,11 +7,11 @@ export GNUPGHOME mkdir $GNUPGHOME cp $KEYRING $GNUPGHOME +chmod -R go-rwx $GNUPGHOME + +export MAVEN_GPG_PASSPHRASE="${PASSPHRASE}" MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pci,central,release \ - -Dgpg.passphrase=${PASSPHRASE} \ - -Dgpg.secretKeyring=${GNUPGHOME}/secring.gpg \ - -DstagingDescription="Releasing Spring Vault" \ clean deploy -U -B MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pdistribute \ diff --git a/settings.xml b/settings.xml index abf0ff7e..ce50c89f 100644 --- a/settings.xml +++ b/settings.xml @@ -26,8 +26,8 @@ central - ${env.CENTRAL_TOKEN_USERNAME} - ${env.CENTRAL_TOKEN_PASSWORD} + ${env.CENTRAL_TOKEN_USR} + ${env.CENTRAL_TOKEN_PSW}