From 297d9fc9414a5e5a90e6e89a9506cd89ec07ca5c Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Mon, 16 Oct 2023 08:59:21 -0500 Subject: [PATCH] Use spring-builds+jenkins for ge.spring.io. To show the right gravatar, apply the proper user.name property. --- Jenkinsfile | 2 +- ci/build-and-deploy-to-artifactory.sh | 2 +- ci/build-and-deploy-to-maven-central.sh | 2 +- ci/rc-close.sh | 2 +- ci/rc-open.sh | 2 +- ci/rc-release.sh | 2 +- ci/smoke-test-against-artifactory.sh | 2 +- ci/smoke-test-against-maven-central.sh | 2 +- ci/test.sh | 2 +- ci/version.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8eef20e7..b03b59f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,7 +255,7 @@ pipeline { "-Dartifactory.username=${ARTIFACTORY_USR} " + "-Dartifactory.password=${ARTIFACTORY_PSW} " + "-Dartifactory.distribution-repository=temp-private-local " + - '-Dmaven.test.skip=true -Dmaven.deploy.skip=true deploy -B' + '-Duser.name=spring-builds+jenkins -Dmaven.test.skip=true -Dmaven.deploy.skip=true deploy -B' } } } diff --git a/ci/build-and-deploy-to-artifactory.sh b/ci/build-and-deploy-to-artifactory.sh index ac132cd3..1269ced2 100755 --- a/ci/build-and-deploy-to-artifactory.sh +++ b/ci/build-and-deploy-to-artifactory.sh @@ -9,7 +9,7 @@ export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW} echo 'Deploying to Artifactory...' -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ -s settings.xml \ -Pdistribute,${RELEASE_TYPE} \ -Dmaven.test.skip=true \ diff --git a/ci/build-and-deploy-to-maven-central.sh b/ci/build-and-deploy-to-maven-central.sh index 2826f84c..56ea1345 100755 --- a/ci/build-and-deploy-to-maven-central.sh +++ b/ci/build-and-deploy-to-maven-central.sh @@ -16,7 +16,7 @@ export GNUPGHOME mkdir $GNUPGHOME cp $KEYRING $GNUPGHOME -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ -s settings.xml \ -Pdistribute,central \ -Dmaven.test.skip=true \ diff --git a/ci/rc-close.sh b/ci/rc-close.sh index fbe1323e..713fc432 100755 --- a/ci/rc-close.sh +++ b/ci/rc-close.sh @@ -6,7 +6,7 @@ STAGING_PROFILE_ID=$1 echo 'Closing remote repository on Maven Central...' -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ -s settings.xml \ -Pcentral \ -DstagingRepositoryId=${STAGING_PROFILE_ID} \ diff --git a/ci/rc-open.sh b/ci/rc-open.sh index 7d718da0..220dbcdf 100755 --- a/ci/rc-open.sh +++ b/ci/rc-open.sh @@ -4,7 +4,7 @@ set -euo pipefail echo "Opening a remote repository for this release..." -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ -s settings.xml \ -Pcentral \ -DstagingProfileId=${STAGING_PROFILE_ID} \ diff --git a/ci/rc-release.sh b/ci/rc-release.sh index b5835325..5aff589a 100755 --- a/ci/rc-release.sh +++ b/ci/rc-release.sh @@ -6,7 +6,7 @@ STAGING_REPOSITORY_ID=$1 echo 'Release to Maven central...' -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ -s settings.xml \ -Pcentral \ -DstagingRepositoryId="${STAGING_REPOSITORY_ID}" \ diff --git a/ci/smoke-test-against-artifactory.sh b/ci/smoke-test-against-artifactory.sh index 3ecd27a8..d2255919 100755 --- a/ci/smoke-test-against-artifactory.sh +++ b/ci/smoke-test-against-artifactory.sh @@ -8,7 +8,7 @@ echo 'Smoke test against Artifactory...' cd smoke-tests -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ -Partifactory \ -Dspring-ws.version="${PROJECT_VERSION}" \ clean dependency:purge-local-repository verify -B -U diff --git a/ci/smoke-test-against-maven-central.sh b/ci/smoke-test-against-maven-central.sh index 1994c86e..f39235b3 100755 --- a/ci/smoke-test-against-maven-central.sh +++ b/ci/smoke-test-against-maven-central.sh @@ -9,7 +9,7 @@ echo 'Smoke test against Maven Central...' cd smoke-tests -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ -Pmaven-central \ -DstagingRepositoryId="${STAGING_REPOSITORY_ID}" \ -Dspring-ws.version="${PROJECT_VERSION}" \ diff --git a/ci/test.sh b/ci/test.sh index bd4d93e9..ba458fba 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -5,6 +5,6 @@ set -euo pipefail export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR} export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW} -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \ +MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" \ ./mvnw -s settings.xml \ -P${PROFILE} clean dependency:list test -Dsort -B -U diff --git a/ci/version.sh b/ci/version.sh index aae179c3..8890d6e4 100755 --- a/ci/version.sh +++ b/ci/version.sh @@ -2,7 +2,7 @@ set -euo pipefail -VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ +VERSION=`MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate \ -Dexpression=project.version -q -DforceStdout | tail -1`