@@ -44,7 +44,7 @@ pipeline {
4444 sh ' sleep 10'
4545 sh ' mongo --eval "rs.initiate({_id: \' rs0\' , members:[{_id: 0, host: \' 127.0.0.1:27017\' }]});"'
4646 sh ' sleep 15'
47- sh ' MAVEN_OPTS="-Duser.name=spring-builds+ jenkins -Duser.home=/tmp/jenkins-home" ' +
47+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p[' jenkins.user.name'] } " + ' -Duser.home=/tmp/jenkins-home" ' +
4848 ' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
4949 ' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
5050 ' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -81,7 +81,7 @@ pipeline {
8181 sh ' sleep 10'
8282 sh ' mongosh --eval "rs.initiate({_id: \' rs0\' , members:[{_id: 0, host: \' 127.0.0.1:27017\' }]});"'
8383 sh ' sleep 15'
84- sh ' MAVEN_OPTS="-Duser.name=spring-builds+ jenkins -Duser.home=/tmp/jenkins-home" ' +
84+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p[' jenkins.user.name'] } " + ' -Duser.home=/tmp/jenkins-home" ' +
8585 ' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
8686 ' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
8787 ' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -115,18 +115,18 @@ pipeline {
115115 steps {
116116 script {
117117 docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
118- sh ' MAVEN_OPTS="-Duser.name=spring-builds+ jenkins -Duser.home=/tmp/jenkins-home" ' +
119- ' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
120- ' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
121- ' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
122- ' ./mvnw -s settings.xml -Pci,artifactory ' +
123- ' -Dartifactory.server=https://repo.spring.io ' +
118+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p[' jenkins.user.name'] } " + ' -Duser.home=/tmp/jenkins-home" ' +
119+ " DEVELOCITY_CACHE_USERNAME=${ DEVELOCITY_CACHE_USR} " +
120+ " DEVELOCITY_CACHE_PASSWORD=${ DEVELOCITY_CACHE_PSW} " +
121+ " GRADLE_ENTERPRISE_ACCESS_KEY=${ DEVELOCITY_ACCESS_KEY} " +
122+ " ./mvnw -s settings.xml -Pci,artifactory " +
123+ " -Dartifactory.server=${ p['artifactory.url'] } " +
124124 " -Dartifactory.username=${ ARTIFACTORY_USR} " +
125125 " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
126- " -Dartifactory.staging-repository=libs- snapshot-local " +
126+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
127127 " -Dartifactory.build-name=spring-data-rest " +
128128 " -Dartifactory.build-number=${ BUILD_NUMBER} " +
129- ' -Dmaven.test.skip=true clean deploy -U -B'
129+ " -Dmaven.test.skip=true clean deploy -U -B"
130130 }
131131 }
132132 }
0 commit comments