@@ -42,7 +42,8 @@ pipeline {
4242 sh ' sleep 10'
4343 sh ' mongo --eval "rs.initiate({_id: \' rs0\' , members:[{_id: 0, host: \' 127.0.0.1:27017\' }]});"'
4444 sh ' sleep 15'
45- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
45+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
46+ ' ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
4647 }
4748 }
4849 }
@@ -73,7 +74,8 @@ pipeline {
7374 sh ' sleep 10'
7475 sh ' mongosh --eval "rs.initiate({_id: \' rs0\' , members:[{_id: 0, host: \' 127.0.0.1:27017\' }]});"'
7576 sh ' sleep 15'
76- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
77+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
78+ ' ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
7779 }
7880 }
7981 }
@@ -101,14 +103,15 @@ pipeline {
101103 steps {
102104 script {
103105 docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
104- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
105- ' -Dartifactory.server=https://repo.spring.io ' +
106+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
107+ " ./mvnw -s settings.xml -Pci,artifactory " +
108+ " -Dartifactory.server=${ p['artifactory.url']} " +
106109 " -Dartifactory.username=${ ARTIFACTORY_USR} " +
107110 " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
108- " -Dartifactory.staging-repository=libs- snapshot-local " +
111+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
109112 " -Dartifactory.build-name=spring-data-rest " +
110113 " -Dartifactory.build-number=${ BUILD_NUMBER} " +
111- ' -Dmaven.test.skip=true clean deploy -U -B'
114+ " -Dmaven.test.skip=true clean deploy -U -B"
112115 }
113116 }
114117 }
0 commit comments