@@ -31,12 +31,12 @@ pipeline {
31
31
}
32
32
options { timeout(time : 30 , unit : ' MINUTES' ) }
33
33
environment {
34
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
34
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
35
35
}
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" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
40
40
}
41
41
}
42
42
}
@@ -62,7 +62,7 @@ pipeline {
62
62
steps {
63
63
script {
64
64
docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.docker' ]) {
65
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
65
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p[' jenkins.user.name'] } " + ' -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
66
66
}
67
67
}
68
68
}
@@ -82,22 +82,21 @@ pipeline {
82
82
label ' data'
83
83
}
84
84
options { timeout(time : 20 , unit : ' MINUTES' ) }
85
-
86
85
environment {
87
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
86
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
88
87
}
89
-
90
88
steps {
91
89
script {
92
90
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 ' +
91
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
92
+ ' ./mvnw -s settings.xml -Pci,artifactory ' +
93
+ " -Dartifactory.server=${ p['artifactory.url']} " +
95
94
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
96
95
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
97
- " -Dartifactory.staging-repository=libs- snapshot-local " +
96
+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
98
97
" -Dartifactory.build-name=spring-data-ldap " +
99
98
" -Dartifactory.build-number=${ BUILD_NUMBER} " +
100
- ' -Dmaven.test.skip=true clean deploy -U -B'
99
+ ' -Dmaven.test.skip=true clean deploy -U -B '
101
100
}
102
101
}
103
102
}
0 commit comments