Skip to content

Commit 7cee7f2

Browse files
committed
Use Java 17 to build snapshots for Artifactory.
Closes #2557
1 parent 2101175 commit 7cee7f2

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Jenkinsfile

Lines changed: 5 additions & 5 deletions
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 verify -Dsort -U -B'
66+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -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 verify -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 verify -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} " +

ci/pipeline.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
java.main.tag=8u312-b07-jdk
33
java.11.tag=11.0.13_8-jdk
44
java.15.tag=15.0.2_7-jdk-hotspot
5+
java.lts.tag=17.0.2_8-jdk
56

67
# Docker container images - standard
78
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}

0 commit comments

Comments
 (0)