From 47f3704705c5dfa8a75eb9d355d7eab23e0b5465 Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Wed, 14 Apr 2021 14:32:35 -0500 Subject: [PATCH] Use settings.xml for credentials. --- Jenkinsfile | 2 +- ci/build-and-deploy-to-artifactory.sh | 2 +- ci/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd67c64..8340494 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -161,7 +161,7 @@ pipeline { steps { script { - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pdocs ' + + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pdocs ' + '-Dartifactory.server=https://repo.spring.io ' + "-Dartifactory.username=${ARTIFACTORY_USR} " + "-Dartifactory.password=${ARTIFACTORY_PSW} " + diff --git a/ci/build-and-deploy-to-artifactory.sh b/ci/build-and-deploy-to-artifactory.sh index 80e30e0..c5fa6e8 100755 --- a/ci/build-and-deploy-to-artifactory.sh +++ b/ci/build-and-deploy-to-artifactory.sh @@ -8,4 +8,4 @@ set -euo pipefail echo 'Deploying to Artifactory...' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \ - ./mvnw -P${PROFILE} -Dmaven.test.skip=true clean deploy -B + ./mvnw -s settings.xml -P${PROFILE} -Dmaven.test.skip=true clean deploy -B diff --git a/ci/test.sh b/ci/test.sh index c2bb677..abf46cf 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -3,4 +3,4 @@ set -euo pipefail MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \ - ./mvnw -P${PROFILE} clean dependency:list test -Dsort -U -B + ./mvnw -s settings.xml -P${PROFILE} clean dependency:list test -Dsort -U -B