@@ -38,7 +38,7 @@ pipeline {
38
38
steps {
39
39
script {
40
40
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
41
- sh ' MAVEN_OPTS="-Duser.name=spring-builds+ jenkins -Duser.home=/tmp/jenkins-home" ' +
41
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p[' jenkins.user.name'] } " + ' -Duser.home=/tmp/jenkins-home" ' +
42
42
' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
43
43
' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
44
44
' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -70,7 +70,7 @@ pipeline {
70
70
steps {
71
71
script {
72
72
docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.basic' ]) {
73
- sh ' MAVEN_OPTS="-Duser.name=spring-builds+ jenkins -Duser.home=/tmp/jenkins-home" ' +
73
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p[' jenkins.user.name'] } " + ' -Duser.home=/tmp/jenkins-home" ' +
74
74
' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
75
75
' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
76
76
' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -94,25 +94,23 @@ pipeline {
94
94
label ' data'
95
95
}
96
96
options { timeout(time : 20 , unit : ' MINUTES' ) }
97
-
98
97
environment {
99
98
ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
100
99
DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
101
100
DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
102
101
}
103
-
104
102
steps {
105
103
script {
106
104
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
107
- sh ' MAVEN_OPTS="-Duser.name=spring-builds+ jenkins -Duser.home=/tmp/jenkins-home" ' +
105
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p[' jenkins.user.name'] } " + ' -Duser.home=/tmp/jenkins-home" ' +
108
106
' DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
109
107
' DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
110
108
' GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
111
- ' ./mvnw -s settings.xml -Pci,artifactory ' +
112
- ' -Dartifactory.server=https://repo.spring.io ' +
109
+ " ./mvnw -s settings.xml -Pci,artifactory " +
110
+ " -Dartifactory.server=${ p['artifactory.url'] } " +
113
111
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
114
112
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
115
- " -Dartifactory.staging-repository=libs- snapshot-local " +
113
+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
116
114
" -Dartifactory.build-name=spring-data-keyvalue " +
117
115
" -Dartifactory.build-number=${ BUILD_NUMBER} " +
118
116
' -Dmaven.test.skip=true clean deploy -U -B'
0 commit comments