@@ -15,7 +15,7 @@ def GRADLE_ENTERPRISE_SECRET_ACCESS_KEY = string(credentialsId: 'gradle_enterpri
15
15
variable : ' GRADLE_ENTERPRISE_ACCESS_KEY' )
16
16
def SPRING_SIGNING_SECRING = file(credentialsId : ' spring-signing-secring.gpg' , variable : ' SIGNING_KEYRING_FILE' )
17
17
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 ' )
19
19
def ARTIFACTORY_CREDENTIALS = usernamePassword(credentialsId : ' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' , usernameVariable : ' ARTIFACTORY_USERNAME' , passwordVariable : ' ARTIFACTORY_PASSWORD' )
20
20
def JENKINS_PRIVATE_SSH_KEY = file(credentialsId : ' docs.spring.io-jenkins_private_ssh_key' , variable : ' DEPLOY_SSH_KEY' )
21
21
def SONAR_LOGIN_CREDENTIALS = string(credentialsId : ' spring-sonar.login' , variable : ' SONAR_LOGIN' )
@@ -158,16 +158,16 @@ try {
158
158
sh " git clean -dfx"
159
159
withCredentials([SPRING_SIGNING_SECRING ,
160
160
SPRING_GPG_PASSPHRASE ,
161
- OSSRH_CREDENTIALS ,
161
+ OSSRH_S01_CREDENTIALS ,
162
162
ARTIFACTORY_CREDENTIALS ,
163
163
GRADLE_ENTERPRISE_CACHE_USER ,
164
164
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY ]) {
165
165
withEnv([jdkEnv(),
166
166
" GRADLE_ENTERPRISE_CACHE_USERNAME=${ GRADLE_ENTERPRISE_CACHE_USERNAME} " ,
167
167
" GRADLE_ENTERPRISE_CACHE_PASSWORD=${ GRADLE_ENTERPRISE_CACHE_PASSWORD} " ,
168
168
" 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= $O SSRH_USERNAME -PossrhPassword= $O SSRH_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= $O SSRH_USERNAME -PossrhPassword= $O SSRH_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= $O SSRH_S01_TOKEN_USERNAME -PossrhTokenPassword= $O SSRH_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= $O SSRH_S01_TOKEN_USERNAME -PossrhTokenPassword= $O SSRH_S01_TOKEN_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace --no-parallel"
171
171
}
172
172
}
173
173
}
@@ -180,7 +180,7 @@ try {
180
180
sh " git clean -dfx"
181
181
withCredentials([JENKINS_PRIVATE_SSH_KEY ,
182
182
SPRING_GPG_PASSPHRASE ,
183
- OSSRH_CREDENTIALS ,
183
+ OSSRH_S01_CREDENTIALS ,
184
184
ARTIFACTORY_CREDENTIALS ,
185
185
GRADLE_ENTERPRISE_CACHE_USER ,
186
186
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY ]) {
@@ -201,7 +201,7 @@ try {
201
201
sh " git clean -dfx"
202
202
withCredentials([JENKINS_PRIVATE_SSH_KEY ,
203
203
SPRING_GPG_PASSPHRASE ,
204
- OSSRH_CREDENTIALS ,
204
+ OSSRH_S01_CREDENTIALS ,
205
205
ARTIFACTORY_CREDENTIALS ,
206
206
GRADLE_ENTERPRISE_CACHE_USER ,
207
207
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY ]) {
0 commit comments