Skip to content

Commit b538333

Browse files
committed
Add settings.xml and update Artifactory build name.
See #188
1 parent 4ff8e3e commit b538333

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

Jenkinsfile

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,7 @@ pipeline {
4040
script {
4141
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
4242
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
43-
"./mvnw -Pwith-bom-client verify -B -U"
44-
}
45-
}
46-
}
47-
}
48-
49-
stage("Verify other configurations") {
50-
when {
51-
beforeAgent(true)
52-
allOf {
53-
branch(pattern: "main|(\\d+\\.\\d+\\.x)", comparator: "REGEXP")
54-
not { triggeredBy 'UpstreamCause' }
55-
}
56-
}
57-
parallel {
58-
stage("verify (next)") {
59-
agent {
60-
label 'data'
61-
}
62-
options { timeout(time: 30, unit: 'MINUTES') }
63-
environment {
64-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
65-
}
66-
steps {
67-
script {
68-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
69-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
70-
"./mvnw -Pwith-bom-client verify -B -U"
71-
}
72-
}
43+
"./mvnw -s settings.xml -Pwith-bom-client verify -B -U"
7344
}
7445
}
7546
}
@@ -96,13 +67,13 @@ pipeline {
9667
script {
9768
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
9869
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
99-
"./mvnw -Pci,artifactory " +
70+
"./mvnw -s settings.xml -Pci,artifactory " +
10071
"-Dartifactory.server=${p['artifactory.url']} " +
10172
"-Dartifactory.username=${ARTIFACTORY_USR} " +
10273
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
10374
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
10475
"-Dartifactory.build-name=spring-data-bom " +
105-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
76+
"-Dartifactory.build-number=spring-data-bom-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
10677
"-Dmaven.test.skip=true clean deploy -U -B"
10778
}
10879
}

settings.xml

Lines changed: 29 additions & 0 deletions
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)