Skip to content

Commit

Permalink
Merge pull request #381 from paketo-buildpacks/java-22-23
Browse files Browse the repository at this point in the history
Remove Java 22 and add Java 23
  • Loading branch information
dmikusa authored Oct 4, 2024
2 parents c178ee3 + e29645a commit 3b8687f
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
12 changes: 6 additions & 6 deletions .github/pipeline-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ dependencies:
with:
glob: amazon-corretto-[\d.-]+-linux-x64.tar.gz
repository: corretto-21
- name: JDK 22
- name: JDK 23
id: jdk
version_pattern: "22\\.[\\d]+\\.[\\d]+"
version_pattern: "23\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/amazon-corretto-dependency:main
with:
glob: amazon-corretto-[\d.-]+-linux-x64.tar.gz
repository: corretto-22
repository: corretto-23

# ARM64
- name: JDK 8 ARM64
Expand Down Expand Up @@ -94,11 +94,11 @@ dependencies:
glob: amazon-corretto-[\d.-]+-linux-aarch64.tar.gz
repository: corretto-21
arch: arm64
- name: JDK 22 ARM64
- name: JDK 23 ARM64
id: jdk
version_pattern: "22\\.[\\d]+\\.[\\d]+"
version_pattern: "23\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/amazon-corretto-dependency:main
with:
glob: amazon-corretto-[\d.-]+-linux-aarch64.tar.gz
repository: corretto-22
repository: corretto-23
arch: arm64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Update JDK 22 ARM64
name: Update JDK 23 ARM64
"on":
schedule:
- cron: 0 5 * * 1-5
Expand Down Expand Up @@ -29,7 +29,7 @@ jobs:
with:
arch: arm64
glob: amazon-corretto-[\d.-]+-linux-aarch64.tar.gz
repository: corretto-22
repository: corretto-23
- name: Update Buildpack Dependency
id: buildpack
run: |
Expand Down Expand Up @@ -87,18 +87,18 @@ jobs:
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 22\.[\d]+\.[\d]+
VERSION_PATTERN: 23\.[\d]+\.[\d]+
- uses: peter-evans/create-pull-request@v6
with:
author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
body: Bumps `JDK 22 ARM64` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jdk-22-arm-64
body: Bumps `JDK 23 ARM64` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jdk-23-arm-64
commit-message: |-
Bump JDK 22 ARM64 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
Bump JDK 23 ARM64 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
Bumps JDK 22 ARM64 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}.
Bumps JDK 23 ARM64 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 22 ARM64 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
title: Bump JDK 23 ARM64 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Update JDK 22
name: Update JDK 23
"on":
schedule:
- cron: 0 5 * * 1-5
Expand Down Expand Up @@ -28,7 +28,7 @@ jobs:
uses: docker://ghcr.io/paketo-buildpacks/actions/amazon-corretto-dependency:main
with:
glob: amazon-corretto-[\d.-]+-linux-x64.tar.gz
repository: corretto-22
repository: corretto-23
- name: Update Buildpack Dependency
id: buildpack
run: |
Expand Down Expand Up @@ -86,18 +86,18 @@ jobs:
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 22\.[\d]+\.[\d]+
VERSION_PATTERN: 23\.[\d]+\.[\d]+
- uses: peter-evans/create-pull-request@v6
with:
author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
body: Bumps `JDK 22` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jdk-22
body: Bumps `JDK 23` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jdk-23
commit-message: |-
Bump JDK 22 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
Bump JDK 23 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
Bumps JDK 22 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}.
Bumps JDK 23 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 22 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
title: Bump JDK 23 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
28 changes: 14 additions & 14 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,16 @@ api = "0.7"
uri = "https://aws.amazon.com/corretto/faqs/#Licensing_and_Open_Source"

[[metadata.dependencies]]
cpes = ["cpe:2.3:a:oracle:jdk:22.0.2:*:*:*:*:*:*:*", "cpe:2.3:a:amazon:corretto:22.0.2:*:*:*:*:*:*:*"]
cpes = ["cpe:2.3:a:oracle:jdk:23.0.0:*:*:*:*:*:*:*", "cpe:2.3:a:amazon:corretto:23.0.0:*:*:*:*:*:*:*"]
id = "jdk"
name = "Corretto JDK"
purl = "pkg:generic/amazon/corretto-jdk@22.0.2?arch=amd64"
sha256 = "cb4a931f717aea0d715083411106d8aec3c916316525511bb0d20d4084ae85e0"
source = "https://github.com/corretto/corretto-22/archive/refs/tags/22.0.2.9.1.tar.gz"
source-sha256 = "524f971a97afc8af9d9aacb7a280448cf88945358dad4c334bdcdc09a20ea9b5"
purl = "pkg:generic/amazon/corretto-jdk@23.0.0?arch=amd64"
sha256 = "42915255e6eef02b694a0e676fe920bc9f5e78594617001562cabfaaa77374e6"
source = "https://github.com/corretto/corretto-23/archive/refs/tags/23.0.0.37.1.tar.gz"
source-sha256 = "780efe5b4e8aaf273e02cd178ed7be4a1bfd4aa0fe574791c12aa81c5c3ef5d5"
stacks = ["*"]
uri = "https://corretto.aws/downloads/resources/22.0.2.9.1/amazon-corretto-22.0.2.9.1-linux-x64.tar.gz"
version = "22.0.2"
uri = "https://corretto.aws/downloads/resources/23.0.0.37.1/amazon-corretto-23.0.0.37.1-linux-x64.tar.gz"
version = "23.0.0"

[[metadata.dependencies.licenses]]
type = "GPL-2.0 WITH Classpath-exception-2.0"
Expand Down Expand Up @@ -283,16 +283,16 @@ api = "0.7"
uri = "https://aws.amazon.com/corretto/faqs/#Licensing_and_Open_Source"

[[metadata.dependencies]]
cpes = ["cpe:2.3:a:oracle:jdk:22.0.2:*:*:*:*:*:*:*", "cpe:2.3:a:amazon:corretto:22.0.2:*:*:*:*:*:*:*"]
cpes = ["cpe:2.3:a:oracle:jdk:23.0.0:*:*:*:*:*:*:*", "cpe:2.3:a:amazon:corretto:23.0.0:*:*:*:*:*:*:*"]
id = "jdk"
name = "Corretto JDK"
purl = "pkg:generic/amazon/corretto-jdk@22.0.2?arch=arm64"
sha256 = "89ebafecd01faffee5cfbbbe30d7cef4e55d89b6fae38e0b87fadf015f1c44b8"
source = "https://github.com/corretto/corretto-22/archive/refs/tags/22.0.2.9.1.tar.gz"
source-sha256 = "524f971a97afc8af9d9aacb7a280448cf88945358dad4c334bdcdc09a20ea9b5"
purl = "pkg:generic/amazon/corretto-jdk@23.0.0?arch=arm64"
sha256 = "6df6f165b05578991e1796901c31f0947dd8a22500eeef7adc9c070248e56fdb"
source = "https://github.com/corretto/corretto-23/archive/refs/tags/23.0.0.37.1.tar.gz"
source-sha256 = "780efe5b4e8aaf273e02cd178ed7be4a1bfd4aa0fe574791c12aa81c5c3ef5d5"
stacks = ["*"]
uri = "https://corretto.aws/downloads/resources/22.0.2.9.1/amazon-corretto-22.0.2.9.1-linux-aarch64.tar.gz"
version = "22.0.2"
uri = "https://corretto.aws/downloads/resources/23.0.0.37.1/amazon-corretto-23.0.0.37.1-linux-aarch64.tar.gz"
version = "23.0.0"

[[metadata.dependencies.licenses]]
type = "GPL-2.0 WITH Classpath-exception-2.0"
Expand Down

0 comments on commit 3b8687f

Please sign in to comment.