diff --git a/Jenkinsfile b/Jenkinsfile index afb78f80..677b15ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -214,7 +214,7 @@ pipeline { steps { script { - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pdistribute,docs ' + + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pdistribute,docs ' + '-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 80e30e0f..c5fa6e8a 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 6ff29373..121aaa3a 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 -B + ./mvnw -s settings.xml -P${PROFILE} clean dependency:list test -Dsort -B diff --git a/pom.xml b/pom.xml index 12383dde..5ab0f782 100644 --- a/pom.xml +++ b/pom.xml @@ -312,32 +312,6 @@ 5.1.3.BUILD-SNAPSHOT 5.1.2.BUILD-SNAPSHOT - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-release - Spring Releases - https://repo.spring.io/release - - false - - - @@ -907,7 +881,7 @@ - spring-snapshots + spring-libs-snapshot Spring Snapshots https://repo.spring.io/libs-snapshot @@ -915,12 +889,12 @@ - spring-milestones + spring-libs-milestone Spring Milestones https://repo.spring.io/libs-milestone - spring-releases + spring-libs-release Spring Releases https://repo.spring.io/libs-release diff --git a/settings.xml b/settings.xml index 11275707..ab948e9f 100644 --- a/settings.xml +++ b/settings.xml @@ -9,6 +9,26 @@ ${env.SONATYPE_USR} ${env.SONATYPE_PSW} + + spring-plugins-release + ${env.ARTIFACTORY_USR} + ${env.ARTIFACTORY_PSW} + + + spring-libs-snapshot + ${env.ARTIFACTORY_USR} + ${env.ARTIFACTORY_PSW} + + + spring-libs-milestone + ${env.ARTIFACTORY_USR} + ${env.ARTIFACTORY_PSW} + + + spring-libs-release + ${env.ARTIFACTORY_USR} + ${env.ARTIFACTORY_PSW} + \ No newline at end of file