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

Enable Java 11 profile based on the used Java version.

Use Java 17 to build snapshots that are distributed via Artifactory.

Closes #1652
---
 Jenkinsfile            | 6 +++---
 ci/pipeline.properties | 2 +-
 parent/pom.xml         | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e3620345..01d343f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
 						script {
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								docker.image(p['docker.java.next.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'
 								}
 							}
 						}
@@ -73,7 +73,7 @@ pipeline {
 						script {
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								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 -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'
 								}
 							}
 						}
@@ -95,7 +95,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 b3314cdc..8cbdb943 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,7 +1,7 @@
 # Java versions
 java.main.tag=8u312-b07-jdk
 java.next.tag=11.0.13_8-jdk
-java.lts.tag=17.0.1_12-jdk
+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}
diff --git a/parent/pom.xml b/parent/pom.xml
index 7e10728f..837f5721 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -218,6 +218,10 @@
 				<java-activation.version>1.1.1</java-activation.version>
 			</properties>
 
+			<activation>
+				<jdk>(11,</jdk>
+			</activation>
+
 			<dependencies>
 				<dependency>
 					<groupId>javax.xml.bind</groupId>
@@ -245,7 +249,7 @@
 		<!--
 			Profile to be run before a release is executed, currently does the following:
 
-			- Prevents thrid-party snapshot dependencies in projects
+			- Prevents third-party snapshot dependencies in projects
 		-->
 
 		<profile>