Skip to content

Commit

Permalink
Merge pull request #163 from paketo-buildpacks/java-17
Browse files Browse the repository at this point in the history
Add metadata for Java 17
  • Loading branch information
Daniel Mikusa authored Dec 10, 2021
2 parents f0aa91b + d7aae7f commit c161017
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 12 deletions.
18 changes: 12 additions & 6 deletions .github/pipeline-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-jdk-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-jdk-17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-jdk-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-jre-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-jre-17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-jre-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
28 changes: 28 additions & 0 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]"
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/[email protected]"
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"

Expand Down

0 comments on commit c161017

Please sign in to comment.