From e15c50cfe75020202f592b60d7212ec38d5a9e08 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 21 Feb 2022 14:22:01 +0100
Subject: [PATCH] Use Java 17 to build snapshots for Artifactory.

Closes #311
---
 Jenkinsfile            | 10 +++++-----
 ci/pipeline.properties |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4d5f9c6..96af6e2 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 test -Dsort -U -B'
+									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -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 test -Dsort -U -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 test -Dsort -U -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 0146900..c4d8e8a 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -2,6 +2,7 @@
 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}