From f0547f7bc97174815d43501c55bfb442a9a5db7e Mon Sep 17 00:00:00 2001
From: Daniel Mikusa <dmikusa@vmware.com>
Date: Fri, 10 Dec 2021 11:34:55 -0500
Subject: [PATCH 1/2] Add metadata for Java 17

Signed-off-by: Daniel Mikusa <dmikusa@vmware.com>
---
 .github/pipeline-descriptor.yml     | 18 ++++++++++++------
 .github/workflows/update-jdk-11.yml |  2 +-
 .github/workflows/update-jdk-17.yml |  2 +-
 .github/workflows/update-jdk-8.yml  |  2 +-
 .github/workflows/update-jre-11.yml |  2 +-
 .github/workflows/update-jre-17.yml |  2 +-
 .github/workflows/update-jre-8.yml  |  2 +-
 buildpack.toml                      | 28 ++++++++++++++++++++++++++++
 8 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml
index 32cc12a..8ff7fd2 100644
--- a/.github/pipeline-descriptor.yml
+++ b/.github/pipeline-descriptor.yml
@@ -20,7 +20,8 @@ dependencies:
 - name:            JDK 8
   id:              jdk
   version_pattern: "8(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
+  # TODO: change back to `"[\\d]+\\.[\\d]+\\.[\\d]+"` when update to libpak 1.57.1 or 1.58.0
+  cpe_pattern:     "0\\.29\\.0"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
     glob: ibm-semeru-open-jdk_x64_linux_.+_openj9-.+.tar.gz
@@ -31,7 +32,8 @@ dependencies:
 - name:            JRE 8
   id:              jre
   version_pattern: "8(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
+  # TODO: change back to `"[\\d]+\\.[\\d]+\\.[\\d]+"` when update to libpak 1.57.1 or 1.58.0
+  cpe_pattern:     "0\\.29\\.0"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
     glob: ibm-semeru-open-jre_x64_linux_.+_openj9-.+.tar.gz
@@ -42,7 +44,8 @@ dependencies:
 - name:            JDK 11
   id:              jdk
   version_pattern: "11(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
+  # TODO: change back to `"[\\d]+\\.[\\d]+\\.[\\d]+"` when update to libpak 1.57.1 or 1.58.0
+  cpe_pattern:     "0\\.29\\.0"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
     glob: ibm-semeru-open-jdk_x64_linux_.+_openj9-.+.tar.gz
@@ -53,7 +56,8 @@ dependencies:
 - name:            JRE 11
   id:              jre
   version_pattern: "11(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
+  # TODO: change back to `"[\\d]+\\.[\\d]+\\.[\\d]+"` when update to libpak 1.57.1 or 1.58.0
+  cpe_pattern:     "0\\.29\\.0"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
     glob: ibm-semeru-open-jre_x64_linux_.+_openj9-.+.tar.gz
@@ -64,7 +68,8 @@ dependencies:
 - name:            JDK 17
   id:              jdk
   version_pattern: "17(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
+  # TODO: change back to `"[\\d]+\\.[\\d]+\\.[\\d]+"` when update to libpak 1.57.1 or 1.58.0
+  cpe_pattern:     "0\\.29\\.1"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
     glob: ibm-semeru-open-jdk_x64_linux_.+_openj9-.+.tar.gz
@@ -75,7 +80,8 @@ dependencies:
 - name:            JRE 17
   id:              jre
   version_pattern: "17(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
+  # TODO: change back to `"[\\d]+\\.[\\d]+\\.[\\d]+"` when update to libpak 1.57.1 or 1.58.0
+  cpe_pattern:     "0\\.29\\.1"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
     glob: ibm-semeru-open-jre_x64_linux_.+_openj9-.+.tar.gz
diff --git a/.github/workflows/update-jdk-11.yml b/.github/workflows/update-jdk-11.yml
index c428ae7..275f61b 100644
--- a/.github/workflows/update-jdk-11.yml
+++ b/.github/workflows/update-jdk-11.yml
@@ -90,7 +90,7 @@ jobs:
                 echo "::set-output name=version-label::${LABEL}"
               env:
                 CPE: ${{ steps.dependency.outputs.cpe }}
-                CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+'
+                CPE_PATTERN: 0\.29\.0
                 ID: jdk
                 PURL: ${{ steps.dependency.outputs.purl }}
                 PURL_PATTERN: ""
diff --git a/.github/workflows/update-jdk-17.yml b/.github/workflows/update-jdk-17.yml
index 2b2b4c9..8066fd5 100644
--- a/.github/workflows/update-jdk-17.yml
+++ b/.github/workflows/update-jdk-17.yml
@@ -90,7 +90,7 @@ jobs:
                 echo "::set-output name=version-label::${LABEL}"
               env:
                 CPE: ${{ steps.dependency.outputs.cpe }}
-                CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+'
+                CPE_PATTERN: 0\.29\.1
                 ID: jdk
                 PURL: ${{ steps.dependency.outputs.purl }}
                 PURL_PATTERN: ""
diff --git a/.github/workflows/update-jdk-8.yml b/.github/workflows/update-jdk-8.yml
index 2519184..5da2bdf 100644
--- a/.github/workflows/update-jdk-8.yml
+++ b/.github/workflows/update-jdk-8.yml
@@ -90,7 +90,7 @@ jobs:
                 echo "::set-output name=version-label::${LABEL}"
               env:
                 CPE: ${{ steps.dependency.outputs.cpe }}
-                CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+'
+                CPE_PATTERN: 0\.29\.0
                 ID: jdk
                 PURL: ${{ steps.dependency.outputs.purl }}
                 PURL_PATTERN: ""
diff --git a/.github/workflows/update-jre-11.yml b/.github/workflows/update-jre-11.yml
index dd304ad..48e30a1 100644
--- a/.github/workflows/update-jre-11.yml
+++ b/.github/workflows/update-jre-11.yml
@@ -90,7 +90,7 @@ jobs:
                 echo "::set-output name=version-label::${LABEL}"
               env:
                 CPE: ${{ steps.dependency.outputs.cpe }}
-                CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+'
+                CPE_PATTERN: 0\.29\.0
                 ID: jre
                 PURL: ${{ steps.dependency.outputs.purl }}
                 PURL_PATTERN: ""
diff --git a/.github/workflows/update-jre-17.yml b/.github/workflows/update-jre-17.yml
index 5c6c050..19f3e94 100644
--- a/.github/workflows/update-jre-17.yml
+++ b/.github/workflows/update-jre-17.yml
@@ -90,7 +90,7 @@ jobs:
                 echo "::set-output name=version-label::${LABEL}"
               env:
                 CPE: ${{ steps.dependency.outputs.cpe }}
-                CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+'
+                CPE_PATTERN: 0\.29\.1
                 ID: jre
                 PURL: ${{ steps.dependency.outputs.purl }}
                 PURL_PATTERN: ""
diff --git a/.github/workflows/update-jre-8.yml b/.github/workflows/update-jre-8.yml
index eae9460..2eaf430 100644
--- a/.github/workflows/update-jre-8.yml
+++ b/.github/workflows/update-jre-8.yml
@@ -90,7 +90,7 @@ jobs:
                 echo "::set-output name=version-label::${LABEL}"
               env:
                 CPE: ${{ steps.dependency.outputs.cpe }}
-                CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+'
+                CPE_PATTERN: 0\.29\.0
                 ID: jre
                 PURL: ${{ steps.dependency.outputs.purl }}
                 PURL_PATTERN: ""
diff --git a/buildpack.toml b/buildpack.toml
index c590aa4..ac73303 100644
--- a/buildpack.toml
+++ b/buildpack.toml
@@ -158,6 +158,34 @@ api = "0.7"
       type = "EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception"
       uri = "https://github.com/eclipse/openj9/blob/master/LICENSE"
 
+  [[metadata.dependencies]]
+    cpes = ["cpe:2.3:a:eclipse:openj9:0.29.1:*:*:*:*:*:*:*"]
+    id = "jdk"
+    name = "OpenJ9 JDK"
+    purl = "pkg:generic/ibmruntimes/semeru-jre@17.0.1"
+    sha256 = "154f6411742ee1f8cbf004d72e7e71053b9ad4e89090cb930b6f16951e56503e"
+    stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"]
+    uri = "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.1%2B12_openj9-0.29.1/ibm-semeru-open-jdk_x64_linux_17.0.1_12_openj9-0.29.1.tar.gz"
+    version = "17.0.1"
+
+    [[metadata.dependencies.licenses]]
+      type = "EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception"
+      uri = "https://github.com/eclipse/openj9/blob/master/LICENSE"
+
+  [[metadata.dependencies]]
+    cpes = ["cpe:2.3:a:eclipse:openj9:0.29.1:*:*:*:*:*:*:*"]
+    id = "jre"
+    name = "OpenJ9 JRE"
+    purl = "pkg:generic/ibmruntimes/semeru-jre@11.0.1"
+    sha256 = "69f1f7a6b3d4a701f3c25ac338768d8a414594fa2c50ddfbd8c014e8a5e790db"
+    stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"]
+    uri = "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.1%2B12_openj9-0.29.1/ibm-semeru-open-jre_x64_linux_17.0.1_12_openj9-0.29.1.tar.gz"
+    version = "17.0.1"
+
+    [[metadata.dependencies.licenses]]
+      type = "EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception"
+      uri = "https://github.com/eclipse/openj9/blob/master/LICENSE"
+
 [[stacks]]
   id = "io.buildpacks.stacks.bionic"
 

From d7aae7f1717f6b7da0934ad369d589dd056157ca Mon Sep 17 00:00:00 2001
From: Daniel Mikusa <dmikusa@vmware.com>
Date: Fri, 10 Dec 2021 11:47:50 -0500
Subject: [PATCH 2/2] Update buildpack.toml

---
 buildpack.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildpack.toml b/buildpack.toml
index ac73303..d4e7751 100644
--- a/buildpack.toml
+++ b/buildpack.toml
@@ -176,7 +176,7 @@ api = "0.7"
     cpes = ["cpe:2.3:a:eclipse:openj9:0.29.1:*:*:*:*:*:*:*"]
     id = "jre"
     name = "OpenJ9 JRE"
-    purl = "pkg:generic/ibmruntimes/semeru-jre@11.0.1"
+    purl = "pkg:generic/ibmruntimes/semeru-jre@17.0.1"
     sha256 = "69f1f7a6b3d4a701f3c25ac338768d8a414594fa2c50ddfbd8c014e8a5e790db"
     stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"]
     uri = "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.1%2B12_openj9-0.29.1/ibm-semeru-open-jre_x64_linux_17.0.1_12_openj9-0.29.1.tar.gz"