From 55fcb21b00418808a49515dac66d82e1b0c1090b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 14 Nov 2022 15:57:47 +0100
Subject: [PATCH] Refine properties.

---
 Jenkinsfile                                       |  7 ++-----
 ci/prepare-and-build.bash                         |  9 +--------
 ci/push-and-distribute.bash                       |  5 -----
 src/main/resources/application-jenkins.properties | 13 ++++---------
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index df3e705..892f9e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,17 +26,14 @@ pipeline {
 
 			environment {
 				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('3a20bcaa-d8ad-48e3-901d-9fbc941376ee')
 				DEPLOYMENT_API_KEY = credentials('repo_spring_io-jenkins-release-token')
 				STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
-				PASSPHRASE = credentials('spring-gpg-passphrase')
-				KEYRING = credentials('spring-signing-secring.gpg')
+				MAVEN_SIGNING_KEYRING = credentials('spring-signing-secring.gpg')
+				MAVEN_SIGNING_KEY_PASSWORD = credentials('spring-gpg-passphrase')
 				GIT_SIGNING_KEY = credentials('spring-gpg-github-private-key-jenkins')
 				GIT_SIGNING_KEY_PASSWORD = credentials('spring-gpg-github-passphrase-jenkins')
 				SONATYPE = credentials('oss-login')
-				GPG_KEYNAME = credentials('spring-data-release-gpg-keyname')
 			}
 
 			steps {
diff --git a/ci/prepare-and-build.bash b/ci/prepare-and-build.bash
index ea0de6f..8144396 100755
--- a/ci/prepare-and-build.bash
+++ b/ci/prepare-and-build.bash
@@ -30,22 +30,16 @@ if test -f application-local.properties; then
 
     function spring-data-release-shell {
         java \
-            "-Ddeployment.settings-xml=${SETTINGS_XML}" \
-            "-Ddeployment.local=true" \
-            "-Dmaven.mavenHome=${MAVEN_HOME}" \
-            "-Dgpg.executable=/usr/bin/gpg" \
-            "-Dio.workDir=dist" \
             -jar target/spring-data-release-cli.jar \
             --cmdfile target/prepare-and-build.shell
     }
 else
     echo "You are running inside Jenkins! Using parameters fed from the agent."
 
-    cp $KEYRING $GNUPGHOME
+    cp ${MAVEN_SIGNING_KEYRING} ${GNUPGHOME}
 
     ls -ld ~/.gnupg
     ls -lR ~/.gnupg
-    id
 
     echo "${GIT_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg --batch --yes --passphrase-fd 0 --import "${GIT_SIGNING_KEY}"
     /usr/bin/gpg -k
@@ -53,7 +47,6 @@ else
     function spring-data-release-shell {
         java \
             -Dspring.profiles.active=jenkins \
-            -Dmaven.home=${MAVEN_HOME} \
             -jar target/spring-data-release-cli.jar \
             --cmdfile target/prepare-and-build.shell
     }
diff --git a/ci/push-and-distribute.bash b/ci/push-and-distribute.bash
index cb7dd18..7a2bc9e 100755
--- a/ci/push-and-distribute.bash
+++ b/ci/push-and-distribute.bash
@@ -22,11 +22,6 @@ if test -f application-local.properties; then
 
     function spring-data-release-shell {
         java \
-            "-Ddeployment.settings-xml=${SETTINGS_XML}" \
-            "-Ddeployment.local=true" \
-            "-Dmaven.mavenHome=${MAVEN_HOME}" \
-            "-Dgpg.executable=/usr/bin/gpg" \
-            "-Dio.workDir=dist" \
             -jar target/spring-data-release-cli.jar \
             --cmdfile target/push-and-distribute.shell
     }
diff --git a/src/main/resources/application-jenkins.properties b/src/main/resources/application-jenkins.properties
index a0db912..a99b90d 100644
--- a/src/main/resources/application-jenkins.properties
+++ b/src/main/resources/application-jenkins.properties
@@ -1,6 +1,6 @@
 git.username=${GIT_USERNAME}
-git.author=${GIT_AUTHOR}
-git.email=${GIT_EMAIL}
+git.author=Spring Builds
+git.email=builds@springframework.org
 git.password=${GIT_PASSWORD}
 
 git.gpg.keyname=6743E1BD
@@ -14,19 +14,14 @@ deployment.api-key=${DEPLOYMENT_API_KEY_PSW}
 deployment.maven-central.stagingProfileId=${STAGING_PROFILE_ID}
 deployment.settings-xml=${SETTINGS_XML}
 
-gpg.keyname=${GPG_KEYNAME}
-gpg.passphrase=${PASSPHRASE}
-gpg.secretKeyring=${GNUPGHOME}/secring.gpg
-gpg.executable=/usr/bin/gpg
-
 sagan.key=n/a
 
 maven.home=${MAVEN_HOME}
 maven.console-logger=false
 maven.repo.local=${RELEASE_TOOLS_CACHE}
 
-maven.maven-central.gpg.keyname=${GPG_KEYNAME}
-maven.maven-central.gpg.passphrase=${PASSPHRASE}
+maven.maven-central.gpg.keyname=9A2C7A98E457C53D
+maven.maven-central.gpg.passphrase=${MAVEN_SIGNING_KEY_PASSWORD}
 maven.maven-central.gpg.secretKeyring=${GNUPGHOME}/secring.gpg
 maven.maven-central.gpg.executable=/usr/bin/gpg