diff --git a/Jenkinsfile b/Jenkinsfile
index 6b451816..7c4451ab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,14 +63,14 @@ pipeline {
script {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
}
}
}
}
}
- stage("test: baseline (jdk15)") {
+ stage("test: baseline (LTS)") {
agent {
label 'data'
}
@@ -81,8 +81,8 @@ pipeline {
steps {
script {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
- docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
+ docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
}
}
}
@@ -110,7 +110,7 @@ pipeline {
steps {
script {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+ docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
'-Dartifactory.server=https://repo.spring.io ' +
"-Dartifactory.username=${ARTIFACTORY_USR} " +
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 01469006..2245d2ea 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -2,11 +2,13 @@
java.main.tag=8u312-b07-jdk
java.11.tag=11.0.13_8-jdk
java.15.tag=15.0.2_7-jdk-hotspot
+java.lts.tag=17.0.2_8-jdk
# Docker container images - standard
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
docker.java.11.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.11.tag}
docker.java.15.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/adoptopenjdk:${java.15.tag}
+docker.java.lts.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.lts.tag}
# Supported versions of MongoDB
docker.mongodb.4.0.version=4.0.23
diff --git a/parent/pom.xml b/parent/pom.xml
index 38d3cf87..a725e24e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,6 +216,10 @@
1.1.1
+
+ (11,
+
+
javax.xml.bind
@@ -243,7 +247,7 @@