Skip to content

Commit 8fb25c6

Browse files
committed
Use Java 17 to build snapshots for Artifactory.
Closes #2448
1 parent 9fd335b commit 8fb25c6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Jenkinsfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ pipeline {
6868
script {
6969
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7070
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
71-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
71+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
7272
}
7373
}
7474
}
7575
}
7676
}
7777

78-
stage("test: baseline (jdk17)") {
78+
stage("test: baseline (LTS)") {
7979
agent {
8080
label 'data'
8181
}
@@ -87,7 +87,7 @@ pipeline {
8787
script {
8888
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
8989
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
90-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
90+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
9191
}
9292
}
9393
}
@@ -116,7 +116,7 @@ pipeline {
116116
steps {
117117
script {
118118
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
119-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
119+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
120120
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
121121
'-Dartifactory.server=https://repo.spring.io ' +
122122
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)