@@ -36,7 +36,8 @@ pipeline {
36
36
steps {
37
37
script {
38
38
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
39
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
39
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
40
+ ' ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
40
41
}
41
42
}
42
43
}
@@ -62,7 +63,8 @@ pipeline {
62
63
steps {
63
64
script {
64
65
docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.basic' ]) {
65
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
66
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
67
+ ' ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
66
68
}
67
69
}
68
70
}
@@ -82,19 +84,18 @@ pipeline {
82
84
label ' data'
83
85
}
84
86
options { timeout(time : 20 , unit : ' MINUTES' ) }
85
-
86
87
environment {
87
88
ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
88
89
}
89
-
90
90
steps {
91
91
script {
92
92
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
93
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
94
- ' -Dartifactory.server=https://repo.spring.io ' +
93
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
94
+ " ./mvnw -s settings.xml -Pci,artifactory " +
95
+ " -Dartifactory.server=${ p['artifactory.url']} " +
95
96
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
96
97
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
97
- " -Dartifactory.staging-repository=libs- snapshot-local " +
98
+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
98
99
" -Dartifactory.build-name=spring-data-keyvalue " +
99
100
" -Dartifactory.build-number=${ BUILD_NUMBER} " +
100
101
' -Dmaven.test.skip=true clean deploy -U -B'
0 commit comments