From fc106525c3a6671072f907f9ddec97be128d2fd6 Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Wed, 20 Sep 2023 14:56:00 -0400
Subject: [PATCH] Replace Java 20 with 21

---
 .github/pipeline-descriptor.yml                  |  6 +++---
 ...pb-update-jdk-20.yml => pb-update-jdk-21.yml} | 16 ++++++++--------
 buildpack.toml                                   | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename .github/workflows/{pb-update-jdk-20.yml => pb-update-jdk-21.yml} (90%)

diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml
index f0acd4c..38032a5 100644
--- a/.github/pipeline-descriptor.yml
+++ b/.github/pipeline-descriptor.yml
@@ -42,10 +42,10 @@ dependencies:
   with:
     glob:       amazon-corretto-[\d.-]+-linux-x64.tar.gz
     repository: corretto-17
-- name:            JDK 20
+- name:            JDK 21
   id:              jdk
-  version_pattern: "20\\.[\\d]+\\.[\\d]+"
+  version_pattern: "21\\.[\\d]+\\.[\\d]+"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/amazon-corretto-dependency:main
   with:
     glob:       amazon-corretto-[\d.-]+-linux-x64.tar.gz
-    repository: corretto-20
+    repository: corretto-21
diff --git a/.github/workflows/pb-update-jdk-20.yml b/.github/workflows/pb-update-jdk-21.yml
similarity index 90%
rename from .github/workflows/pb-update-jdk-20.yml
rename to .github/workflows/pb-update-jdk-21.yml
index 85b681d..7a1c2e2 100644
--- a/.github/workflows/pb-update-jdk-20.yml
+++ b/.github/workflows/pb-update-jdk-21.yml
@@ -1,4 +1,4 @@
-name: Update JDK 20
+name: Update JDK 21
 "on":
     schedule:
         - cron: 0 5 * * 1-5
@@ -45,7 +45,7 @@ jobs:
               uses: docker://ghcr.io/paketo-buildpacks/actions/amazon-corretto-dependency:main
               with:
                 glob: amazon-corretto-[\d.-]+-linux-x64.tar.gz
-                repository: corretto-20
+                repository: corretto-21
             - name: Update Buildpack Dependency
               id: buildpack
               run: |
@@ -94,18 +94,18 @@ jobs:
                 SHA256: ${{ steps.dependency.outputs.sha256 }}
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
-                VERSION_PATTERN: 20\.[\d]+\.[\d]+
+                VERSION_PATTERN: 21\.[\d]+\.[\d]+
             - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
-                body: Bumps `JDK 20` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
-                branch: update/buildpack/jdk-20
+                body: Bumps `JDK 21` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
+                branch: update/buildpack/jdk-21
                 commit-message: |-
-                    Bump JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
+                    Bump JDK 21 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
 
-                    Bumps JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}.
+                    Bumps JDK 21 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}.
                 delete-branch: true
                 labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
                 signoff: true
-                title: Bump JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
+                title: Bump JDK 21 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
                 token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/buildpack.toml b/buildpack.toml
index b9e696c..3e1a6ea 100644
--- a/buildpack.toml
+++ b/buildpack.toml
@@ -181,14 +181,14 @@ api = "0.7"
       uri = "https://aws.amazon.com/corretto/faqs/#Licensing_and_Open_Source"
 
   [[metadata.dependencies]]
-    cpes = ["cpe:2.3:a:oracle:jdk:20.0.2:*:*:*:*:*:*:*", "cpe:2.3:a:amazon:corretto:20.0.2:*:*:*:*:*:*:*"]
+    cpes = ["cpe:2.3:a:oracle:jdk:21.0.0:*:*:*:*:*:*:*", "cpe:2.3:a:amazon:corretto:21.0.0:*:*:*:*:*:*:*"]
     id = "jdk"
     name = "Corretto JDK"
-    purl = "pkg:generic/amazon/corretto-jdk@20.0.2"
-    sha256 = "3b60fe04966d0aa762bf1fc2974ad239cf7ab887a657a9e7e3c75a9310e34db2"
+    purl = "pkg:generic/amazon/corretto-jdk@21.0.0"
+    sha256 = "1b7ae2cabb15b69867511a08e0091bd2e2df67064ff444bbe883900819801e4b"
     stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"]
-    uri = "https://corretto.aws/downloads/resources/20.0.2.10.1/amazon-corretto-20.0.2.10.1-linux-x64.tar.gz"
-    version = "20.0.2"
+    uri = "https://corretto.aws/downloads/resources/21.0.0.35.1/amazon-corretto-21.0.0.35.1-linux-x64.tar.gz"
+    version = "21.0.0"
 
     [[metadata.dependencies.licenses]]
       type = "GPL-2.0 WITH Classpath-exception-2.0"