From 535a584c3c05980d0c6c96463ddb0e95a75b2333 Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Mon, 27 Mar 2023 15:52:30 -0400 Subject: [PATCH] Replace Java 19 with 20 --- .github/pipeline-descriptor.yml | 12 +++++------ .github/workflows/pb-update-go.yml | 2 +- ...update-jdk-19.yml => pb-update-jdk-20.yml} | 16 +++++++-------- ...update-jre-19.yml => pb-update-jre-20.yml} | 16 +++++++-------- buildpack.toml | 20 +++++++++---------- 5 files changed, 33 insertions(+), 33 deletions(-) rename .github/workflows/{pb-update-jdk-19.yml => pb-update-jdk-20.yml} (91%) rename .github/workflows/{pb-update-jre-19.yml => pb-update-jre-20.yml} (91%) diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml index 3dea5f6..95d7fd4 100644 --- a/.github/pipeline-descriptor.yml +++ b/.github/pipeline-descriptor.yml @@ -70,19 +70,19 @@ dependencies: implementation: hotspot type: jre version: "[17,18)" -- name: JDK 19 +- name: JDK 20 id: jdk - version_pattern: "19\\.[\\d]+\\.[\\d]+" + version_pattern: "20\\.[\\d]+\\.[\\d]+" uses: docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main with: implementation: hotspot type: jdk - version: "[19,20)" -- name: JRE 19 + version: "[20,21)" +- name: JRE 20 id: jre - version_pattern: "19\\.[\\d]+\\.[\\d]+" + version_pattern: "20\\.[\\d]+\\.[\\d]+" uses: docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main with: implementation: hotspot type: jre - version: "[19,20)" + version: "[20,21)" diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index b391501..793ed57 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -1,7 +1,7 @@ name: Update Go "on": schedule: - - cron: 46 2 * * 1 + - cron: 27 2 * * 1 workflow_dispatch: {} jobs: update: diff --git a/.github/workflows/pb-update-jdk-19.yml b/.github/workflows/pb-update-jdk-20.yml similarity index 91% rename from .github/workflows/pb-update-jdk-19.yml rename to .github/workflows/pb-update-jdk-20.yml index 867e9d2..4b6076c 100644 --- a/.github/workflows/pb-update-jdk-19.yml +++ b/.github/workflows/pb-update-jdk-20.yml @@ -1,4 +1,4 @@ -name: Update JDK 19 +name: Update JDK 20 "on": schedule: - cron: 0 5 * * 1-5 @@ -46,7 +46,7 @@ jobs: with: implementation: hotspot type: jdk - version: '[19,20)' + version: '[20,21)' - name: Update Buildpack Dependency id: buildpack run: | @@ -95,18 +95,18 @@ jobs: SHA256: ${{ steps.dependency.outputs.sha256 }} URI: ${{ steps.dependency.outputs.uri }} VERSION: ${{ steps.dependency.outputs.version }} - VERSION_PATTERN: 19\.[\d]+\.[\d]+ + VERSION_PATTERN: 20\.[\d]+\.[\d]+ - uses: peter-evans/create-pull-request@v4 with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `JDK 19` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/jdk-19 + body: Bumps `JDK 20` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/jdk-20 commit-message: |- - Bump JDK 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + Bump JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - Bumps JDK 19 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 }}. delete-branch: true labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade signoff: true - title: Bump JDK 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + title: Bump JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-jre-19.yml b/.github/workflows/pb-update-jre-20.yml similarity index 91% rename from .github/workflows/pb-update-jre-19.yml rename to .github/workflows/pb-update-jre-20.yml index 5c225d6..03c044a 100644 --- a/.github/workflows/pb-update-jre-19.yml +++ b/.github/workflows/pb-update-jre-20.yml @@ -1,4 +1,4 @@ -name: Update JRE 19 +name: Update JRE 20 "on": schedule: - cron: 0 5 * * 1-5 @@ -46,7 +46,7 @@ jobs: with: implementation: hotspot type: jre - version: '[19,20)' + version: '[20,21)' - name: Update Buildpack Dependency id: buildpack run: | @@ -95,18 +95,18 @@ jobs: SHA256: ${{ steps.dependency.outputs.sha256 }} URI: ${{ steps.dependency.outputs.uri }} VERSION: ${{ steps.dependency.outputs.version }} - VERSION_PATTERN: 19\.[\d]+\.[\d]+ + VERSION_PATTERN: 20\.[\d]+\.[\d]+ - uses: peter-evans/create-pull-request@v4 with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `JRE 19` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/jre-19 + body: Bumps `JRE 20` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/jre-20 commit-message: |- - Bump JRE 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + Bump JRE 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - Bumps JRE 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}. + Bumps JRE 20 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 JRE 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + title: Bump JRE 20 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 c5f32ce..8d2502d 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -223,28 +223,28 @@ api = "0.7" uri = "https://openjdk.java.net/legal/gplv2+ce.html" [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:jdk:19.0.2:*:*:*:*:*:*:*"] + cpes = ["cpe:2.3:a:oracle:jdk:20.0.0:*:*:*:*:*:*:*"] id = "jdk" name = "Adoptium JDK" - purl = "pkg:generic/adoptium-jdk@19.0.2?arch=amd64" - sha256 = "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165" + purl = "pkg:generic/adoptium-jdk@20.0.0?arch=amd64" + sha256 = "fb6000faf47fffcda8caf01f60097d582728a6fffb6c1b85c8075c674f0c9281" stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz" - version = "19.0.2" + uri = "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_x64_linux_hotspot_20_36.tar.gz" + version = "20.0.0" [[metadata.dependencies.licenses]] type = "GPL-2.0 WITH Classpath-exception-2.0" uri = "https://openjdk.java.net/legal/gplv2+ce.html" [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:jre:19.0.2:*:*:*:*:*:*:*"] + cpes = ["cpe:2.3:a:oracle:jre:20.0.0:*:*:*:*:*:*:*"] id = "jre" name = "Adoptium JRE" - purl = "pkg:generic/adoptium-jre@19.0.2?arch=amd64" - sha256 = "7386e10c74f00a4382be0540bc0494854804ad79427d8a50ac77a4c7208ff348" + purl = "pkg:generic/adoptium-jre@20.0.0?arch=amd64" + sha256 = "f41be99b1fd21873b0fa1436bb206119706922e9c4b32298538faf3d1b632a72" stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_linux_hotspot_19.0.2_7.tar.gz" - version = "19.0.2" + uri = "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jre_x64_linux_hotspot_20_36.tar.gz" + version = "20.0.0" [[metadata.dependencies.licenses]] type = "GPL-2.0 WITH Classpath-exception-2.0"