Skip to content

Commit 014bf6f

Browse files
committed
Authenticate with artifactory.
1 parent 3f5707c commit 014bf6f

File tree

5 files changed

+26
-32
lines changed

5 files changed

+26
-32
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ pipeline {
214214

215215
steps {
216216
script {
217-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pdistribute,docs ' +
217+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pdistribute,docs ' +
218218
'-Dartifactory.server=https://repo.spring.io ' +
219219
"-Dartifactory.username=${ARTIFACTORY_USR} " +
220220
"-Dartifactory.password=${ARTIFACTORY_PSW} " +

ci/build-and-deploy-to-artifactory.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ set -euo pipefail
88
echo 'Deploying to Artifactory...'
99

1010
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
11-
./mvnw -P${PROFILE} -Dmaven.test.skip=true clean deploy -B
11+
./mvnw -s settings.xml -P${PROFILE} -Dmaven.test.skip=true clean deploy -B

ci/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set -euo pipefail
44

55
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
6-
./mvnw -P${PROFILE} clean dependency:list test -Dsort -B
6+
./mvnw -s settings.xml -P${PROFILE} clean dependency:list test -Dsort -B

pom.xml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -312,32 +312,6 @@
312312
<spring.version>5.1.3.BUILD-SNAPSHOT</spring.version>
313313
<spring-security.version>5.1.2.BUILD-SNAPSHOT</spring-security.version>
314314
</properties>
315-
<repositories>
316-
<repository>
317-
<id>spring-snapshots</id>
318-
<name>Spring Snapshots</name>
319-
<url>https://repo.spring.io/snapshot</url>
320-
<snapshots>
321-
<enabled>true</enabled>
322-
</snapshots>
323-
</repository>
324-
<repository>
325-
<id>spring-milestones</id>
326-
<name>Spring Milestones</name>
327-
<url>https://repo.spring.io/milestone</url>
328-
<snapshots>
329-
<enabled>false</enabled>
330-
</snapshots>
331-
</repository>
332-
<repository>
333-
<id>spring-release</id>
334-
<name>Spring Releases</name>
335-
<url>https://repo.spring.io/release</url>
336-
<snapshots>
337-
<enabled>false</enabled>
338-
</snapshots>
339-
</repository>
340-
</repositories>
341315
</profile>
342316

343317
<profile>
@@ -907,20 +881,20 @@
907881

908882
<pluginRepositories>
909883
<pluginRepository>
910-
<id>spring-snapshots</id>
884+
<id>spring-libs-snapshot</id>
911885
<name>Spring Snapshots</name>
912886
<url>https://repo.spring.io/libs-snapshot</url>
913887
<snapshots>
914888
<enabled>true</enabled>
915889
</snapshots>
916890
</pluginRepository>
917891
<pluginRepository>
918-
<id>spring-milestones</id>
892+
<id>spring-libs-milestone</id>
919893
<name>Spring Milestones</name>
920894
<url>https://repo.spring.io/libs-milestone</url>
921895
</pluginRepository>
922896
<pluginRepository>
923-
<id>spring-releases</id>
897+
<id>spring-libs-release</id>
924898
<name>Spring Releases</name>
925899
<url>https://repo.spring.io/libs-release</url>
926900
</pluginRepository>

settings.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@
99
<username>${env.SONATYPE_USR}</username>
1010
<password>${env.SONATYPE_PSW}</password>
1111
</server>
12+
<server>
13+
<id>spring-plugins-release</id>
14+
<username>${env.ARTIFACTORY_USR}</username>
15+
<password>${env.ARTIFACTORY_PSW}</password>
16+
</server>
17+
<server>
18+
<id>spring-libs-snapshot</id>
19+
<username>${env.ARTIFACTORY_USR}</username>
20+
<password>${env.ARTIFACTORY_PSW}</password>
21+
</server>
22+
<server>
23+
<id>spring-libs-milestone</id>
24+
<username>${env.ARTIFACTORY_USR}</username>
25+
<password>${env.ARTIFACTORY_PSW}</password>
26+
</server>
27+
<server>
28+
<id>spring-libs-release</id>
29+
<username>${env.ARTIFACTORY_USR}</username>
30+
<password>${env.ARTIFACTORY_PSW}</password>
31+
</server>
1232
</servers>
1333

1434
</settings>

0 commit comments

Comments
 (0)