Skip to content

Commit 4dc4226

Browse files
committed
Remove Docker Registry login.
Closes spring-projects#2633.
1 parent d1836ee commit 4dc4226

File tree

1 file changed

+15
-23
lines changed

1 file changed

+15
-23
lines changed

Jenkinsfile

+15-23
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ pipeline {
3535
}
3636
steps {
3737
script {
38-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
39-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
40-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
41-
}
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 verify -Dsort -U -B'
4240
}
4341
}
4442
}
@@ -63,10 +61,8 @@ pipeline {
6361
}
6462
steps {
6563
script {
66-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
67-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
68-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
69-
}
64+
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 verify -Dsort -U -B'
7066
}
7167
}
7268
}
@@ -82,10 +78,8 @@ pipeline {
8278
}
8379
steps {
8480
script {
85-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
86-
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
87-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
88-
}
81+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
82+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
8983
}
9084
}
9185
}
@@ -112,17 +106,15 @@ pipeline {
112106

113107
steps {
114108
script {
115-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
116-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
117-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
118-
'-Dartifactory.server=https://repo.spring.io ' +
119-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
120-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
121-
"-Dartifactory.staging-repository=libs-snapshot-local " +
122-
"-Dartifactory.build-name=spring-data-commons " +
123-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
124-
'-Dmaven.test.skip=true clean deploy -U -B'
125-
}
109+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
110+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
111+
'-Dartifactory.server=https://repo.spring.io ' +
112+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
113+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
114+
"-Dartifactory.staging-repository=libs-snapshot-local " +
115+
"-Dartifactory.build-name=spring-data-commons " +
116+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
117+
'-Dmaven.test.skip=true clean deploy -U -B'
126118
}
127119
}
128120
}

0 commit comments

Comments
 (0)