Skip to content

Commit af97d52

Browse files
committed
Polishing.
1 parent 0ef3c6a commit af97d52

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

Jenkinsfile

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ pipeline {
2828
}
2929
steps {
3030
script {
31-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
32-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
33-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
34-
}
31+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
32+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
3533
}
3634
}
3735
}
@@ -56,10 +54,8 @@ pipeline {
5654
}
5755
steps {
5856
script {
59-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
60-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
61-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
62-
}
57+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
58+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
6359
}
6460
}
6561
}
@@ -79,17 +75,15 @@ pipeline {
7975

8076
steps {
8177
script {
82-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
83-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
84-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
85-
'-Dartifactory.server=https://repo.spring.io ' +
86-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
87-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
88-
"-Dartifactory.staging-repository=libs-snapshot-local " +
89-
"-Dartifactory.build-name=spring-data-build " +
90-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
91-
'-Dmaven.test.skip=true clean deploy -B -U'
92-
}
78+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
79+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
80+
'-Dartifactory.server=https://repo.spring.io ' +
81+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
82+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
83+
"-Dartifactory.staging-repository=libs-snapshot-local " +
84+
"-Dartifactory.build-name=spring-data-build " +
85+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
86+
'-Dmaven.test.skip=true clean deploy -B -U'
9387
}
9488
}
9589
}

0 commit comments

Comments
 (0)