From 8c74fc34cb81ef1da4febe7fa78a858d51ce7215 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 3 Nov 2023 17:33:10 -0500
Subject: [PATCH] build: java21 and java21-alpine images (#2464)

---
 .github/workflows/build-multiarch.yml | 13 ++++++-------
 .github/workflows/verify-pr.yml       |  8 ++++----
 docs/versions/java.md                 |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 99cb6233..340ad08c 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -19,8 +19,8 @@ jobs:
         # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config
         variant:
           - java21-graalvm
-          - java20
-          - java20-alpine
+          - java21
+          - java21-alpine
           - java17
           - java17-graalvm
           - java17-jdk
@@ -40,13 +40,12 @@ jobs:
             baseImage: container-registry.oracle.com/graalvm/jdk:21-ol8
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.20.2
-        # JAVA 20:
-          - variant: java20
-            baseImage: eclipse-temurin:20-jre
+          - variant: java21
+            baseImage: eclipse-temurin:21-jre
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.19.3
-          - variant: java20-alpine
-            baseImage: eclipse-temurin:20-jre-alpine
+          - variant: java21-alpine
+            baseImage: eclipse-temurin:21-jre-alpine
             platforms: linux/amd64
             mcVersion: 1.19.3
         # JAVA 17:
diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
index f712b908..7a566883 100644
--- a/.github/workflows/verify-pr.yml
+++ b/.github/workflows/verify-pr.yml
@@ -16,14 +16,14 @@ jobs:
       fail-fast: false
       matrix:
         variant:
-          - java20
+          - java21
           - java17
           - java17-alpine
           - java8-multiarch
         include:
-        # JAVA 20:
-          - variant: java20
-            baseImage: eclipse-temurin:20-jre
+        # JAVA 21:
+          - variant: java21
+            baseImage: eclipse-temurin:21-jre
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.19.4
         # JAVA 17:
diff --git a/docs/versions/java.md b/docs/versions/java.md
index abb07186..078f703b 100644
--- a/docs/versions/java.md
+++ b/docs/versions/java.md
@@ -30,8 +30,8 @@ When using the image `itzg/minecraft-server` without a tag, the `latest` image t
 | java17-openj9    | 17           | Debian | OpenJ9         | amd64             |
 | java17-graalvm   | 17           | Oracle | Oracle GraalVM | amd64,arm64       |   
 | java17-alpine    | 17           | Alpine | Hotspot        | amd64             |
-| java20-alpine    | 20           | Alpine | Hotspot        | amd64             |
-| java20           | 20           | Ubuntu | Hotspot        | amd64,arm64       |
+| java21-alpine    | 21           | Alpine | Hotspot        | amd64             |
+| java21           | 21           | Ubuntu | Hotspot        | amd64,arm64       |
 | java21-graalvm   | 21           | Oracle | Oracle GraalVM | amd64,arm64       |   
 
 For example, to use Java version 8 on any supported architecture:
@@ -55,4 +55,4 @@ The following image tags have been deprecated and are no longer receiving update
 - multiarch-latest
 - java16/java16-openj9
 - java17-graalvm-ce
-- java20-graalvm
+- java20-graalvm, java20, java20-alpine