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

Closes #1230
---
 Jenkinsfile                                      | 16 ++++++++--------
 .../Dockerfile                                   |  0
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename ci/{openjdk15-8-cassandra-3.11 => openjdk17-8-cassandra-3.11}/Dockerfile (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 47ded52c0..2cfe1f059 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,10 +58,10 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish JDK 15 + Cassandra 3.11') {
+				stage('Publish JDK LTS + Cassandra 3.11') {
 					when {
 					    anyOf {
-						    changeset "ci/openjdk15-8-cassandra-3.11/**"
+						    changeset "ci/openjdk17-8-cassandra-3.11/**"
 						    changeset "ci/pipeline.properties"
 						}
 					}
@@ -70,7 +70,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.15.tag']}", "--build-arg BASE=${p['docker.java.15.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk15-8-cassandra-3.11/")
+							def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk17-8-cassandra-3.11/")
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
@@ -129,13 +129,13 @@ pipeline {
 								docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.11.tag']}").inside(p['docker.java.inside.basic']) {
 									sh 'mkdir -p /tmp/jenkins-home'
 									sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
-									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
+									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
 								}
 							}
 						}
 					}
 				}
-				stage("test: baseline (jdk15)") {
+				stage("test: baseline (LTS)") {
 					agent {
 						label 'data'
 					}
@@ -146,10 +146,10 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.15.tag']}").inside(p['docker.java.inside.basic']) {
+								docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
 									sh 'mkdir -p /tmp/jenkins-home'
 									sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
-									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
+									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
 								}
 							}
 						}
@@ -177,7 +177,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 'mkdir -p /tmp/jenkins-home'
 							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
diff --git a/ci/openjdk15-8-cassandra-3.11/Dockerfile b/ci/openjdk17-8-cassandra-3.11/Dockerfile
similarity index 100%
rename from ci/openjdk15-8-cassandra-3.11/Dockerfile
rename to ci/openjdk17-8-cassandra-3.11/Dockerfile