From 5996078fe5212710ef3a270ff551805d157d7ea4 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Mon, 12 Jun 2023 19:01:31 -0700
Subject: [PATCH] Test against Java 21 in CI.

See #2602
Original pull request: #2608
---
 Jenkinsfile                                                | 6 +++---
 ci/{openjdk20-redis-6.2 => openjdk21-redis-6.2}/Dockerfile | 0
 ci/pipeline.properties                                     | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename ci/{openjdk20-redis-6.2 => openjdk21-redis-6.2}/Dockerfile (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index cfeac9a71..5f60ef67a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,10 +40,10 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish JDK 20 + Redis 6.2 Docker Image') {
+				stage('Publish JDK 21 + Redis 6.2 Docker Image') {
 					when {
 						anyOf {
-							changeset "ci/openjdk20-redis-6.2/Dockerfile"
+							changeset "ci/openjdk21-redis-6.2/Dockerfile"
 							changeset "Makefile"
 							changeset "ci/pipeline.properties"
 						}
@@ -53,7 +53,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk20-redis-6.2/Dockerfile .")
+							def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk21-redis-6.2/Dockerfile .")
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
diff --git a/ci/openjdk20-redis-6.2/Dockerfile b/ci/openjdk21-redis-6.2/Dockerfile
similarity index 100%
rename from ci/openjdk20-redis-6.2/Dockerfile
rename to ci/openjdk21-redis-6.2/Dockerfile
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 5cc754eb6..8a33425f9 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,10 +1,11 @@
 # Java versions
 java.main.tag=17.0.7_7-jdk-focal
-java.next.tag=20-jdk-jammy
+java.next.tag=21-jdk-bullseye
 
 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/openjdk:${java.next.tag}
+
 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.22
 docker.mongodb.5.0.version=5.0.18