Add missing variables.

See #917
This commit is contained in:
Mark Paluch
2025-06-16 10:08:26 +02:00
parent e82aa55fb0
commit 08db7406ac
4 changed files with 17 additions and 13 deletions

3
Jenkinsfile vendored
View File

@@ -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')
}

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -26,8 +26,8 @@
</server>
<server>
<id>central</id>
<username>${env.CENTRAL_TOKEN_USERNAME}</username>
<password>${env.CENTRAL_TOKEN_PASSWORD}</password>
<username>${env.CENTRAL_TOKEN_USR}</username>
<password>${env.CENTRAL_TOKEN_PSW}</password>
</server>
</servers>