From 9787750d5f3dfd8cea8fdd404ffd5969bfc3d874 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 4 Nov 2022 15:32:32 +0100 Subject: [PATCH] Use correct API key. --- Jenkinsfile | 9 ++------- src/main/resources/application-jenkins.properties | 12 ++++-------- src/main/resources/application.properties | 2 -- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 751a19c..6f50882 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,15 +28,10 @@ pipeline { GIT_USERNAME = credentials('spring-data-release-git-username') GIT_AUTHOR = credentials('spring-data-release-git-author') GIT_EMAIL = credentials('spring-data-release-git-email') - GIT_PASSWORD = credentials('spring-data-release-git-password') + GIT_PASSWORD = credentials('3a20bcaa-d8ad-48e3-901d-9fbc941376ee') GITHUB_API_URL = credentials('spring-data-release-github-api-url') - DEPLOYMENT_USERNAME = credentials('spring-data-release-deployment-username') - DEPLOYMENT_PASSWORD = credentials('spring-data-release-deployment-password') - DEPLOYMENT_API_KEY = credentials('spring-data-release-deployment-api-key') + DEPLOYMENT_API_KEY = credentials('repo_spring_io-jenkins-release-token') STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id') - JIRA_USERNAME = credentials('spring-data-release-jira-username') - JIRA_PASSWORD = credentials('spring-data-release-jira-password') - JIRA_URL = credentials('spring-data-release-jira-url') PASSPHRASE = credentials('spring-gpg-passphrase') KEYRING = credentials('spring-signing-secring.gpg') SONATYPE = credentials('oss-login') diff --git a/src/main/resources/application-jenkins.properties b/src/main/resources/application-jenkins.properties index 5dfa89d..a1ad224 100644 --- a/src/main/resources/application-jenkins.properties +++ b/src/main/resources/application-jenkins.properties @@ -5,22 +5,18 @@ git.password=${GIT_PASSWORD} github.api.url=${GITHUB_API_URL} -deployment.username=${DEPLOYMENT_USERNAME} -deployment.password=${DEPLOYMENT_PASSWORD} -deployment.api-key=${DEPLOYMENT_API_KEY} +deployment.username=${DEPLOYMENT_API_KEY_USR} +deployment.password=${DEPLOYMENT_API_KEY_PSW} +deployment.api-key=${DEPLOYMENT_API_KEY_PSW} deployment.maven-central.stagingProfileId=${STAGING_PROFILE_ID} deployment.settings-xml=${SETTINGS_XML} -jira.username=${JIRA_USERNAME} -jira.password=${JIRA_PASSWORD} -jira.url=${JIRA_URL} - gpg.keyname=${GPG_KEYNAME} gpg.passphrase=${PASSPHRASE} gpg.secretKeyring=${GNUPGHOME}/secring.gpg gpg.executable=/usr/bin/gpg -sagan.key= +sagan.key=n/a maven.home=${MAVEN_HOME} maven.console-logger=false diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 993e64d..d966e61 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,8 +16,6 @@ github.team=christophstrobl,gregturn,jxblum,mp911de,odrotbohm,schauder,meisterme gpg.executable=/usr/local/bin/gpg2 # gpg.keyname # gpg.passphrase -# JIRA -jira.api-url=https://jira.spring.io # GitHub github.api-url=https://api.github.com logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(%-20.20logger{19}){cyan}%clr(:){faint} %m%n%wEx