Skip to content

Commit c9d7e46

Browse files
committed
Authenticate against artifactory.
See #2345.
1 parent 2269fb0 commit c9d7e46

File tree

3 files changed

+43
-10
lines changed

3 files changed

+43
-10
lines changed

Jenkinsfile

+14-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@ pipeline {
2323
label 'data'
2424
}
2525
options { timeout(time: 30, unit: 'MINUTES') }
26+
environment {
27+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
28+
}
2629
steps {
2730
script {
2831
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
2932
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
30-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list verify -Dsort -U -B'
33+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
3134
}
3235
}
3336
}
@@ -47,11 +50,14 @@ pipeline {
4750
label 'data'
4851
}
4952
options { timeout(time: 30, unit: 'MINUTES') }
53+
environment {
54+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
55+
}
5056
steps {
5157
script {
5258
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
5359
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
54-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B'
60+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
5561
}
5662
}
5763
}
@@ -63,11 +69,14 @@ pipeline {
6369
label 'data'
6470
}
6571
options { timeout(time: 30, unit: 'MINUTES') }
72+
environment {
73+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
74+
}
6675
steps {
6776
script {
6877
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6978
docker.image('adoptopenjdk/openjdk15:latest').inside('-v $HOME:/tmp/jenkins-home') {
70-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B'
79+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
7180
}
7281
}
7382
}
@@ -96,7 +105,7 @@ pipeline {
96105
script {
97106
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
98107
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
99-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
108+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
100109
'-Dartifactory.server=https://repo.spring.io ' +
101110
"-Dartifactory.username=${ARTIFACTORY_USR} " +
102111
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -126,7 +135,7 @@ pipeline {
126135
script {
127136
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
128137
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
129-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
138+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
130139
'-Dartifactory.server=https://repo.spring.io ' +
131140
"-Dartifactory.username=${ARTIFACTORY_USR} " +
132141
"-Dartifactory.password=${ARTIFACTORY_PSW} " +

pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,6 @@
375375
<id>spring-plugins-release</id>
376376
<url>https://repo.spring.io/plugins-release</url>
377377
</pluginRepository>
378-
<pluginRepository>
379-
<id>bintray-plugins</id>
380-
<name>bintray-plugins</name>
381-
<url>https://jcenter.bintray.com</url>
382-
</pluginRepository>
383378
</pluginRepositories>
384379

385380
</project>

settings.xml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4+
https://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
6+
<servers>
7+
<server>
8+
<id>spring-plugins-release</id>
9+
<username>${env.ARTIFACTORY_USR}</username>
10+
<password>${env.ARTIFACTORY_PSW}</password>
11+
</server>
12+
<server>
13+
<id>spring-libs-snapshot</id>
14+
<username>${env.ARTIFACTORY_USR}</username>
15+
<password>${env.ARTIFACTORY_PSW}</password>
16+
</server>
17+
<server>
18+
<id>spring-libs-milestone</id>
19+
<username>${env.ARTIFACTORY_USR}</username>
20+
<password>${env.ARTIFACTORY_PSW}</password>
21+
</server>
22+
<server>
23+
<id>spring-libs-release</id>
24+
<username>${env.ARTIFACTORY_USR}</username>
25+
<password>${env.ARTIFACTORY_PSW}</password>
26+
</server>
27+
</servers>
28+
29+
</settings>

0 commit comments

Comments
 (0)