@@ -44,7 +44,7 @@ pipeline {
44
44
sh ' sleep 10'
45
45
sh ' mongo --eval "rs.initiate({_id: \' rs0\' , members:[{_id: 0, host: \' 127.0.0.1:27017\' }]});"'
46
46
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" ' +
48
48
' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
49
49
' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
50
50
' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -81,7 +81,7 @@ pipeline {
81
81
sh ' sleep 10'
82
82
sh ' mongosh --eval "rs.initiate({_id: \' rs0\' , members:[{_id: 0, host: \' 127.0.0.1:27017\' }]});"'
83
83
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" ' +
85
85
' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
86
86
' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
87
87
' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -115,18 +115,18 @@ pipeline {
115
115
steps {
116
116
script {
117
117
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'] } " +
124
124
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
125
125
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
126
- " -Dartifactory.staging-repository=libs- snapshot-local " +
126
+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
127
127
" -Dartifactory.build-name=spring-data-rest " +
128
128
" -Dartifactory.build-number=${ BUILD_NUMBER} " +
129
- ' -Dmaven.test.skip=true clean deploy -U -B'
129
+ " -Dmaven.test.skip=true clean deploy -U -B"
130
130
}
131
131
}
132
132
}
0 commit comments