From 043a4edae59728f75df4c89a4df2dea770763109 Mon Sep 17 00:00:00 2001
From: Rui Li <107525009+rgithubli@users.noreply.github.com>
Date: Tue, 15 Oct 2024 19:18:03 -0700
Subject: [PATCH] Remove 22 (#219)

---
 .github/workflows/verify-images.yml  | 16 ++++++------
 22/headful/al2023/Dockerfile         | 24 ------------------
 22/headless/al2023/Dockerfile        | 24 ------------------
 22/jdk/al2023/Dockerfile             | 24 ------------------
 22/jdk/alpine/3.17/Dockerfile        | 22 -----------------
 22/jdk/alpine/3.18/Dockerfile        | 22 -----------------
 22/jdk/alpine/3.19/Dockerfile        | 22 -----------------
 22/jdk/alpine/3.20/Dockerfile        | 22 -----------------
 22/jdk/debian/Dockerfile             | 26 -------------------
 22/slim/alpine/Dockerfile            | 29 ----------------------
 22/slim/debian/Dockerfile            | 37 ----------------------------
 bin/update-dockerfiles.sh            |  6 -----
 test/test-image-corretto22-jdk.yaml  | 22 -----------------
 test/test-image-corretto22-jre.yaml  | 17 -------------
 test/test-image-corretto22-slim.yaml | 22 -----------------
 versions.json                        |  1 -
 16 files changed, 8 insertions(+), 328 deletions(-)
 delete mode 100644 22/headful/al2023/Dockerfile
 delete mode 100644 22/headless/al2023/Dockerfile
 delete mode 100644 22/jdk/al2023/Dockerfile
 delete mode 100644 22/jdk/alpine/3.17/Dockerfile
 delete mode 100644 22/jdk/alpine/3.18/Dockerfile
 delete mode 100644 22/jdk/alpine/3.19/Dockerfile
 delete mode 100644 22/jdk/alpine/3.20/Dockerfile
 delete mode 100644 22/jdk/debian/Dockerfile
 delete mode 100644 22/slim/alpine/Dockerfile
 delete mode 100644 22/slim/debian/Dockerfile
 delete mode 100644 test/test-image-corretto22-jdk.yaml
 delete mode 100644 test/test-image-corretto22-jre.yaml
 delete mode 100644 test/test-image-corretto22-slim.yaml

diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml
index f832687a..31f1488a 100644
--- a/.github/workflows/verify-images.yml
+++ b/.github/workflows/verify-images.yml
@@ -18,13 +18,13 @@ jobs:
       - name: Test Corretto ${{ matrix.version }} ${{ matrix.package }} package on ${{ matrix.platform }}
         run: ./bin/test-image.sh "${{ matrix.version }}/${{ matrix.package }}/${{ matrix.platform }}/Dockerfile" ${{ matrix.version }} ${{ matrix.package }}
 
-  verify-corretto-22-plus:
-    name: Verify Corretto 22+ JDK Images
+  verify-corretto-23-plus:
+    name: Verify Corretto 23+ JDK Images
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        version: [ 22, 23 ]
+        version: [ 23 ]
         package: [ jdk ]
         platform: [ debian ]
     steps:
@@ -48,13 +48,13 @@ jobs:
       - name: Test Corretto ${{ matrix.version }} ${{ matrix.package }} package on ${{ matrix.platform }}
         run: ./bin/test-image.sh "${{ matrix.version }}/${{ matrix.package }}/${{ matrix.platform }}/Dockerfile" ${{ matrix.version }} ${{ matrix.package }}
 
-  verify-corretto-slim-22-plus:
-    name: Verify Corretto 22+ Slim Images
+  verify-corretto-slim-23-plus:
+    name: Verify Corretto 23+ Slim Images
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        version: [ 22, 23 ]
+        version: [ 23 ]
         package: [ slim ]
         platform: [ alpine, debian ]
     steps:
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 11, 17, 21, 22, 23 ]
+        version: [ 11, 17, 21, 23 ]
         package: [ jdk, headful, headless ]
         platform: [ al2023 ]
     steps:
@@ -99,7 +99,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 8, 11, 17, 21, 22, 23 ]
+        version: [ 8, 11, 17, 21, 23 ]
         os_version: ["3.17", "3.18", "3.19", "3.20"]
     steps:
       - name: Checkout code
diff --git a/22/headful/al2023/Dockerfile b/22/headful/al2023/Dockerfile
deleted file mode 100644
index fd3ae592..00000000
--- a/22/headful/al2023/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM amazonlinux:2023
-
-ARG version=22.0.2.9-1
-ARG package_version=1
-
-RUN set -eux \
-    && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
-    && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
-    && CORRETO_TEMP=$(mktemp -d) \
-    && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-22-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-22-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm") \
-    && for rpm in ${RPM_LIST[@]}; do \
-    curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
-    && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
-    done \
-    && dnf install -y ${CORRETO_TEMP}/*.rpm \
-    && popd \
-    && rm -rf /usr/lib/jvm/java-22-amazon-corretto.$(uname -m)/lib/src.zip \
-    && rm -rf ${CORRETO_TEMP} \
-    && dnf clean all \
-    && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
-
-ENV LANG=C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-22-amazon-corretto
diff --git a/22/headless/al2023/Dockerfile b/22/headless/al2023/Dockerfile
deleted file mode 100644
index 43717d96..00000000
--- a/22/headless/al2023/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM amazonlinux:2023
-
-ARG version=22.0.2.9-1
-ARG package_version=1
-
-RUN set -eux \
-    && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
-    && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
-    && CORRETO_TEMP=$(mktemp -d) \
-    && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-22-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm") \
-    && for rpm in ${RPM_LIST[@]}; do \
-    curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
-    && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
-    done \
-    && dnf install -y ${CORRETO_TEMP}/*.rpm \
-    && popd \
-    && rm -rf /usr/lib/jvm/java-22-amazon-corretto.$(uname -m)/lib/src.zip \
-    && rm -rf ${CORRETO_TEMP} \
-    && dnf clean all \
-    && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
-
-ENV LANG=C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-22-amazon-corretto
diff --git a/22/jdk/al2023/Dockerfile b/22/jdk/al2023/Dockerfile
deleted file mode 100644
index c29ef0f1..00000000
--- a/22/jdk/al2023/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM amazonlinux:2023
-
-ARG version=22.0.2.9-1
-ARG package_version=1
-
-RUN set -eux \
-    && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
-    && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
-    && CORRETO_TEMP=$(mktemp -d) \
-    && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-22-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-22-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-22-amazon-corretto-devel-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-22-amazon-corretto-jmods-$version.amzn2023.${package_version}.$(uname -m).rpm") \
-    && for rpm in ${RPM_LIST[@]}; do \
-    curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
-    && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
-    done \
-    && dnf install -y ${CORRETO_TEMP}/*.rpm \
-    && popd \
-    && rm -rf /usr/lib/jvm/java-22-amazon-corretto.$(uname -m)/lib/src.zip \
-    && rm -rf ${CORRETO_TEMP} \
-    && dnf clean all \
-    && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
-
-ENV LANG=C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-22-amazon-corretto
diff --git a/22/jdk/alpine/3.17/Dockerfile b/22/jdk/alpine/3.17/Dockerfile
deleted file mode 100644
index 4f85b5c3..00000000
--- a/22/jdk/alpine/3.17/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.17
-
-ARG version=22.0.2.9.1
-
-# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
-# The Corretto team will update this file but you may see a few days' delay.
-RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb  /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
-    tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
-    SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
-    echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
-    echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-22=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-22-amazon-corretto/lib/src.zip
-
-
-ENV LANG=C.UTF-8
-
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
-ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
diff --git a/22/jdk/alpine/3.18/Dockerfile b/22/jdk/alpine/3.18/Dockerfile
deleted file mode 100644
index 5ee86e38..00000000
--- a/22/jdk/alpine/3.18/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.18
-
-ARG version=22.0.2.9.1
-
-# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
-# The Corretto team will update this file but you may see a few days' delay.
-RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb  /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
-    tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
-    SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
-    echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
-    echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-22=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-22-amazon-corretto/lib/src.zip
-
-
-ENV LANG=C.UTF-8
-
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
-ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
diff --git a/22/jdk/alpine/3.19/Dockerfile b/22/jdk/alpine/3.19/Dockerfile
deleted file mode 100644
index 64710c37..00000000
--- a/22/jdk/alpine/3.19/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.19
-
-ARG version=22.0.2.9.1
-
-# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
-# The Corretto team will update this file but you may see a few days' delay.
-RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb  /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
-    tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
-    SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
-    echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
-    echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-22=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-22-amazon-corretto/lib/src.zip
-
-
-ENV LANG=C.UTF-8
-
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
-ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
diff --git a/22/jdk/alpine/3.20/Dockerfile b/22/jdk/alpine/3.20/Dockerfile
deleted file mode 100644
index 4227655e..00000000
--- a/22/jdk/alpine/3.20/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.20
-
-ARG version=22.0.2.9.1
-
-# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
-# The Corretto team will update this file but you may see a few days' delay.
-RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb  /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
-    tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
-    SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
-    echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
-    echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-22=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-22-amazon-corretto/lib/src.zip
-
-
-ENV LANG=C.UTF-8
-
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
-ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
diff --git a/22/jdk/debian/Dockerfile b/22/jdk/debian/Dockerfile
deleted file mode 100644
index 2caf023b..00000000
--- a/22/jdk/debian/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM debian:buster-slim
-
-ARG version=22.0.2.9-1
-# In addition to installing the Amazon corretto, we also install
-# fontconfig. The folks who manage the docker hub's
-# official image library have found that font management
-# is a common usecase, and painpoint, and have
-# recommended that Java images include font support.
-#
-# See:
-#  https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java
-
-RUN set -eux \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl ca-certificates gnupg software-properties-common fontconfig java-common \
-    && curl -fL https://apt.corretto.aws/corretto.key | apt-key add - \
-    && add-apt-repository 'deb https://apt.corretto.aws stable main' \
-    && mkdir -p /usr/share/man/man1 || true \
-    && apt-get update \
-    && apt-get install -y java-22-amazon-corretto-jdk=1:$version \
-    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-        curl gnupg software-properties-common
-
-ENV LANG=C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-22-amazon-corretto
diff --git a/22/slim/alpine/Dockerfile b/22/slim/alpine/Dockerfile
deleted file mode 100644
index cd7a4b50..00000000
--- a/22/slim/alpine/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM alpine:3.17
-
-ARG version=22.0.2.9.1
-
-# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently. 
-# The Corretto team will update this file but you may see a few days' delay.
-#
-# Slim:
-#   JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB.
-RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb  /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
-    tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
-    wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
-    SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
-    echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
-    echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-22=$version-r0 binutils && \
-    /usr/lib/jvm/default-jvm/bin/jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim && \
-    apk del binutils amazon-corretto-22 && \
-    mkdir -p /usr/lib/jvm/ && \
-    mv /opt/corretto-slim /usr/lib/jvm/java-22-amazon-corretto && \
-    ln -sfn /usr/lib/jvm/java-22-amazon-corretto /usr/lib/jvm/default-jvm
-
-    
-
-ENV LANG=C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
-ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
diff --git a/22/slim/debian/Dockerfile b/22/slim/debian/Dockerfile
deleted file mode 100644
index 99f11d40..00000000
--- a/22/slim/debian/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM debian:buster-slim
-
-ARG version=22.0.2.9-1
-# In addition to installing the Amazon corretto, we also install
-# fontconfig. The folks who manage the docker hub's
-# official image library have found that font management
-# is a common usecase, and painpoint, and have
-# recommended that Java images include font support.
-#
-# See:
-#  https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java
-#
-# Slim:
-#   JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB.
-RUN set -ux \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl ca-certificates gnupg software-properties-common fontconfig \
-    && curl -fL https://apt.corretto.aws/corretto.key | apt-key add - \
-    && add-apt-repository 'deb https://apt.corretto.aws stable main' \
-    && mkdir -p /usr/share/man/man1 \
-    && apt-get update \
-    && apt-get install -y java-22-amazon-corretto-jdk=1:$version binutils \
-    && jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim \
-    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-            curl gnupg software-properties-common binutils java-22-amazon-corretto-jdk=1:$version \
-    && mkdir -p /usr/lib/jvm \
-    && mv /opt/corretto-slim /usr/lib/jvm/java-22-amazon-corretto \
-    && jdk_tools="java keytool rmid rmiregistry javac jaotc jlink jmod jhsdb jar jarsigner javadoc javap jcmd jconsole jdb jdeps jdeprscan jimage jinfo jmap jps jrunscript jshell jstack jstat jstatd serialver" \
-    && priority=$(echo "1${version}" | sed "s/\(\.\|-\)//g") \
-    && for i in ${jdk_tools}; do \
-          update-alternatives --install /usr/bin/$i $i /usr/lib/jvm/java-22-amazon-corretto/bin/$i ${priority}; \
-       done
-
-
-ENV LANG=C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-22-amazon-corretto
diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh
index 08ba22b7..2d31f883 100755
--- a/bin/update-dockerfiles.sh
+++ b/bin/update-dockerfiles.sh
@@ -106,7 +106,6 @@ CORRETTO_8_GENERIC_LINUX=$(cat versions.json | jq -r '.["8"]' )
 CORRETTO_11_GENERIC_LINUX=$(cat versions.json | jq -r '.["11"]' )
 CORRETTO_17_GENERIC_LINUX=$(cat versions.json | jq -r '.["17"]' )
 CORRETTO_21_GENERIC_LINUX=$(cat versions.json | jq -r '.["21"]' )
-CORRETTO_22_GENERIC_LINUX=$(cat versions.json | jq -r '.["22"]' )
 CORRETTO_23_GENERIC_LINUX=$(cat versions.json | jq -r '.["23"]' )
 
 if [ ! -z "${CORRETTO_11_GENERIC_LINUX}" ]; then
@@ -121,10 +120,6 @@ if [ ! -z "${CORRETTO_21_GENERIC_LINUX}" ]; then
     update_generic_linux ${CORRETTO_21_GENERIC_LINUX} 21
 fi
 
-if [ ! -z "${CORRETTO_22_GENERIC_LINUX}" ]; then
-    update_generic_linux ${CORRETTO_22_GENERIC_LINUX} 22
-fi
-
 if [ ! -z "${CORRETTO_23_GENERIC_LINUX}" ]; then
     update_generic_linux ${CORRETTO_23_GENERIC_LINUX} 23
 fi
@@ -154,5 +149,4 @@ verify_update 8 ${jdk_version}
 verify_update 11 ${CORRETTO_11_GENERIC_LINUX}
 verify_update 17 ${CORRETTO_17_GENERIC_LINUX}
 verify_update 21 ${CORRETTO_21_GENERIC_LINUX}
-verify_update 22 ${CORRETTO_22_GENERIC_LINUX}
 verify_update 23 ${CORRETTO_23_GENERIC_LINUX}
diff --git a/test/test-image-corretto22-jdk.yaml b/test/test-image-corretto22-jdk.yaml
deleted file mode 100644
index d7911337..00000000
--- a/test/test-image-corretto22-jdk.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-schemaVersion: "2.0.0"
-
-metadataTest:
-  envVars:
-    - key: LANG
-      value: C.UTF-8
-
-commandTests:
-  - name: "java command is registered using alternatives."
-    command: "java"
-    args: ["-version"]
-    expectedError: ["OpenJDK Runtime Environment Corretto-22.*"]
-
-  - name: "javac command is registered using alternatives."
-    command: "javac"
-    args: ["-version"]
-    expectedOutput: ["javac 22*"]
-
-  - name: "JAVA_HOME points to the correct directory."
-    command: "$JAVA_HOME/bin/java"
-    args: ["-version"]
-    expectedError: ["OpenJDK Runtime Environment Corretto-22.*"]
diff --git a/test/test-image-corretto22-jre.yaml b/test/test-image-corretto22-jre.yaml
deleted file mode 100644
index bd6d30cf..00000000
--- a/test/test-image-corretto22-jre.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-schemaVersion: "2.0.0"
-
-metadataTest:
-  envVars:
-    - key: LANG
-      value: C.UTF-8
-
-commandTests:
-  - name: "java command is registered using alternatives."
-    command: "java"
-    args: ["-version"]
-    expectedError: ["OpenJDK Runtime Environment Corretto-22.*"]
-
-  - name: "JAVA_HOME points to the correct directory."
-    command: "$JAVA_HOME/bin/java"
-    args: ["-version"]
-    expectedError: ["OpenJDK Runtime Environment Corretto-22.*"]
\ No newline at end of file
diff --git a/test/test-image-corretto22-slim.yaml b/test/test-image-corretto22-slim.yaml
deleted file mode 100644
index d7911337..00000000
--- a/test/test-image-corretto22-slim.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-schemaVersion: "2.0.0"
-
-metadataTest:
-  envVars:
-    - key: LANG
-      value: C.UTF-8
-
-commandTests:
-  - name: "java command is registered using alternatives."
-    command: "java"
-    args: ["-version"]
-    expectedError: ["OpenJDK Runtime Environment Corretto-22.*"]
-
-  - name: "javac command is registered using alternatives."
-    command: "javac"
-    args: ["-version"]
-    expectedOutput: ["javac 22*"]
-
-  - name: "JAVA_HOME points to the correct directory."
-    command: "$JAVA_HOME/bin/java"
-    args: ["-version"]
-    expectedError: ["OpenJDK Runtime Environment Corretto-22.*"]
diff --git a/versions.json b/versions.json
index 0529cd23..d747de42 100644
--- a/versions.json
+++ b/versions.json
@@ -3,7 +3,6 @@
     "11" : "11.0.25.9.1",
     "17" : "17.0.13.11.1",
     "21" : "21.0.5.11.1",
-    "22" : "22.0.2.9.1",
     "23" : "23.0.1.8.1"
 }