Skip to content

Commit df4ee65

Browse files
committed
Use Java 17 to build snapshots for Artifactory.
Closes #423
1 parent b85bcf8 commit df4ee65

File tree

1 file changed

+5
-33
lines changed

1 file changed

+5
-33
lines changed

Jenkinsfile

+5-33
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ pipeline {
6363
script {
6464
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
6565
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
66-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
66+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
6767
}
6868
}
6969
}
7070
}
7171
}
7272

73-
stage("test: baseline (jdk15)") {
73+
stage("test: baseline (LTS)") {
7474
agent {
7575
label 'data'
7676
}
@@ -81,8 +81,8 @@ pipeline {
8181
steps {
8282
script {
8383
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
84-
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
85-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
84+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
85+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
8686
}
8787
}
8888
}
@@ -110,7 +110,7 @@ pipeline {
110110
steps {
111111
script {
112112
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
113-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
113+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
114114
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
115115
'-Dartifactory.server=https://repo.spring.io ' +
116116
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -124,34 +124,6 @@ pipeline {
124124
}
125125
}
126126
}
127-
stage('Publish documentation') {
128-
when {
129-
branch '2.5.x'
130-
}
131-
agent {
132-
label 'data'
133-
}
134-
options { timeout(time: 20, unit: 'MINUTES') }
135-
136-
environment {
137-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
138-
}
139-
140-
steps {
141-
script {
142-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
143-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
144-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
145-
'-Dartifactory.server=https://repo.spring.io ' +
146-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
147-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
148-
"-Dartifactory.distribution-repository=temp-private-local " +
149-
'-Dmaven.test.skip=true clean deploy -U -B'
150-
}
151-
}
152-
}
153-
}
154-
}
155127
}
156128

157129
post {

0 commit comments

Comments
 (0)