Skip to content

Commit

Permalink
Merge pull request #104 from paketo-buildpacks/java-17
Browse files Browse the repository at this point in the history
Add Java 17
  • Loading branch information
Daniel Mikusa authored Sep 17, 2021
2 parents 4b05105 + 5443e6d commit 8ac0d58
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 107 deletions.
18 changes: 13 additions & 5 deletions .github/pipeline-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,17 @@ dependencies:
with:
type: headfull
version: "16"
- id: jvmkill
uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main
- name: JDK 17
id: jdk
version_pattern: "17\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/azul-zulu-dependency:main
with:
owner: cloudfoundry
repository: jvmkill
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
type: jdk
version: "17"
- name: JRE 17
id: jre
version_pattern: "17\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/azul-zulu-dependency:main
with:
type: headfull
version: "17"
95 changes: 0 additions & 95 deletions .github/workflows/update-jvmkill.yml

This file was deleted.

26 changes: 19 additions & 7 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,28 @@ stacks = [ "io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*" ]
uri = "https://openjdk.java.net/legal/gplv2+ce.html"

[[metadata.dependencies]]
id = "jvmkill"
name = "JVMKill Agent"
version = "1.16.0"
uri = "https://github.com/cloudfoundry/jvmkill/releases/download/v1.16.0.RELEASE/jvmkill-1.16.0-RELEASE.so"
sha256 = "a3092627b082cb3cdbbe4b255d35687126aa604e6b613dcda33be9f7e1277162"
id = "jdk"
name = "Azul Zulu JDK"
version = "17.0.0"
uri = "https://repos.azul.com/azure-only/zulu/packages/zulu-17/17.0.0/zulu-17-azure-jdk_17.32.15-17.0.0-linux_x64.tar.gz"
sha256 = "bad"
stacks = [ "io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*" ]

[[metadata.dependencies.licenses]]
type = "Apache-2.0"
uri = "https://github.com/cloudfoundry/jvmkill/blob/main/LICENSE"
type = "GPL-2.0 WITH Classpath-exception-2.0"
uri = "https://openjdk.java.net/legal/gplv2+ce.html"

[[metadata.dependencies]]
id = "jre"
name = "Azul Zulu JRE"
version = "17.0.0"
uri = "https://repos.azul.com/azure-only/zulu/packages/zulu-17/17.0.0/zulu-17-azure-jre_17.32.15-17.0.0-linux_x64.tar.gz"
sha256 = "bad"
stacks = [ "io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*" ]

[[metadata.dependencies.licenses]]
type = "GPL-2.0 WITH Classpath-exception-2.0"
uri = "https://openjdk.java.net/legal/gplv2+ce.html"

[metadata]
pre-package = "scripts/build.sh"
Expand Down

0 comments on commit 8ac0d58

Please sign in to comment.