Skip to content

Commit 56b1dfe

Browse files
committed
Update to use s01.oss.sonatype.org
Closes gh-10015
1 parent 99f72a0 commit 56b1dfe

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def GRADLE_ENTERPRISE_SECRET_ACCESS_KEY = string(credentialsId: 'gradle_enterpri
1515
variable: 'GRADLE_ENTERPRISE_ACCESS_KEY')
1616
def SPRING_SIGNING_SECRING = file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')
1717
def SPRING_GPG_PASSPHRASE = string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')
18-
def OSSRH_CREDENTIALS = usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')
18+
def OSSRH_S01_CREDENTIALS = usernamePassword(credentialsId: 'oss-s01-token', passwordVariable: 'OSSRH_S01_TOKEN_PASSWORD', usernameVariable: 'OSSRH_S01_TOKEN_USERNAME')
1919
def ARTIFACTORY_CREDENTIALS = usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')
2020
def JENKINS_PRIVATE_SSH_KEY = file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')
2121
def SONAR_LOGIN_CREDENTIALS = string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')
@@ -158,16 +158,16 @@ try {
158158
sh "git clean -dfx"
159159
withCredentials([SPRING_SIGNING_SECRING,
160160
SPRING_GPG_PASSPHRASE,
161-
OSSRH_CREDENTIALS,
161+
OSSRH_S01_CREDENTIALS,
162162
ARTIFACTORY_CREDENTIALS,
163163
GRADLE_ENTERPRISE_CACHE_USER,
164164
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
165165
withEnv([jdkEnv(),
166166
"GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
167167
"GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
168168
"GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
169-
sh "./gradlew deployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace --no-parallel"
170-
sh "./gradlew finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace --no-parallel"
169+
sh "./gradlew deployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhTokenUsername=$OSSRH_S01_TOKEN_USERNAME -PossrhTokenPassword=$OSSRH_S01_TOKEN_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace --no-parallel"
170+
sh "./gradlew finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhTokenUsername=$OSSRH_S01_TOKEN_USERNAME -PossrhTokenPassword=$OSSRH_S01_TOKEN_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace --no-parallel"
171171
}
172172
}
173173
}
@@ -180,7 +180,7 @@ try {
180180
sh "git clean -dfx"
181181
withCredentials([JENKINS_PRIVATE_SSH_KEY,
182182
SPRING_GPG_PASSPHRASE,
183-
OSSRH_CREDENTIALS,
183+
OSSRH_S01_CREDENTIALS,
184184
ARTIFACTORY_CREDENTIALS,
185185
GRADLE_ENTERPRISE_CACHE_USER,
186186
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
@@ -201,7 +201,7 @@ try {
201201
sh "git clean -dfx"
202202
withCredentials([JENKINS_PRIVATE_SSH_KEY,
203203
SPRING_GPG_PASSPHRASE,
204-
OSSRH_CREDENTIALS,
204+
OSSRH_S01_CREDENTIALS,
205205
ARTIFACTORY_CREDENTIALS,
206206
GRADLE_ENTERPRISE_CACHE_USER,
207207
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {

0 commit comments

Comments
 (0)