From 8b5bfdfa443905c611e581c942203ed79202c34f Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Sat, 15 Apr 2023 10:06:09 +0200
Subject: [PATCH] Fix CI image reference to JDK21

See gh-30339
---
 ci/images/ci-image/Dockerfile | 2 +-
 ci/images/setup.sh            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index 26b56cbd99..d87ae5556d 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -6,6 +6,6 @@ RUN ./setup.sh
 
 ENV JAVA_HOME /opt/openjdk/java17
 ENV JDK17 /opt/openjdk/java17
-ENV JDK21 /opt/openjdk/java20
+ENV JDK21 /opt/openjdk/java21
 
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index 6724cd5619..729d4b3925 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java17 java20
+for jdk in java17 java21
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk