Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Java 20 with 21 #315

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Replace Java 20 with 21 #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/pipeline-descriptor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,25 @@ dependencies:
tag_filter: sapmachine-(17.*)
latest_by_creation_time: true
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: JDK 20
- name: JDK 21
id: jdk
version_pattern: "20\\.[\\d]+\\.[\\d]+"
version_pattern: "21\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main
with:
glob: sapmachine-jdk-.+_linux-x64_bin.tar.gz
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(20.*)
tag_filter: sapmachine-(21.*)
latest_by_creation_time: true
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: JRE 20
- name: JRE 21
id: jre
version_pattern: "20\\.[\\d]+\\.[\\d]+"
version_pattern: "21\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main
with:
glob: sapmachine-jre-.+_linux-x64_bin.tar.gz
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(20.*)
tag_filter: sapmachine-(21.*)
latest_by_creation_time: true
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
16 changes: 8 additions & 8 deletions .github/workflows/pb-update-jdk-20.yml → .github/workflows/pb-update-jdk-21.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Update JDK 20
name: Update JDK 21
"on":
schedule:
- cron: 0 5 * * 1-5
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
latest_by_creation_time: true
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(20.*)
tag_filter: sapmachine-(21.*)
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: Update Buildpack Dependency
id: buildpack
Expand Down Expand Up @@ -98,18 +98,18 @@ jobs:
SHA256: ${{ steps.dependency.outputs.sha256 }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 20\.[\d]+\.[\d]+
VERSION_PATTERN: 21\.[\d]+\.[\d]+
- uses: peter-evans/create-pull-request@v5
with:
author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
body: Bumps `JDK 20` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jdk-20
body: Bumps `JDK 21` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jdk-21
commit-message: |-
Bump JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
Bump JDK 21 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 }}.
Bumps JDK 21 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 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
title: Bump JDK 21 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
16 changes: 8 additions & 8 deletions .github/workflows/pb-update-jre-20.yml → .github/workflows/pb-update-jre-21.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Update JRE 20
name: Update JRE 21
"on":
schedule:
- cron: 0 5 * * 1-5
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
latest_by_creation_time: true
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(20.*)
tag_filter: sapmachine-(21.*)
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: Update Buildpack Dependency
id: buildpack
Expand Down Expand Up @@ -98,18 +98,18 @@ jobs:
SHA256: ${{ steps.dependency.outputs.sha256 }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 20\.[\d]+\.[\d]+
VERSION_PATTERN: 21\.[\d]+\.[\d]+
- uses: peter-evans/create-pull-request@v5
with:
author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
body: Bumps `JRE 20` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jre-20
body: Bumps `JRE 21` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jre-21
commit-message: |-
Bump JRE 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
Bump JRE 21 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 }}.
Bumps JRE 21 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 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
title: Bump JRE 21 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The buildpack will do the following if a JRE is requested:

| Environment Variable | Description |
| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `$BP_JVM_VERSION` | Configure the JVM version (e.g. `11`, `17`). The buildpack will download JDK and JRE assets that are compatible with this version of the JVM specification. Since the buildpack only ships a single version of each supported line, updates to the buildpack can change the exact version of the JDK or JRE. In order to hold the JDK and JRE versions stable, the buildpack version itself must be stable.<p/><p/>Buildpack releases (and the dependency versions for each release) can be found [here][bpv]. Few users will use this buildpack directly, instead consuming a language buildpack like `paketo-buildpacks/java` who's releases (and the individual buildpack versions and dependency versions for each release) can be found [here](https://github.com/paketo-buildpacks/java/releases). Finally, some users will consume builders like `paketobuildpacks/builder:base` whose releases can be found [here](https://hub.docker.com/r/paketobuildpacks/builder/tags?page=1&name=base). To determine the individual buildpack versions and dependency versions for each builder release use the [`pack inspect-builder <image>`](https://buildpacks.io/docs/reference/pack/pack_inspect-builder/) functionality. |
| `$BP_JVM_VERSION` | Configure the JVM version (e.g. `11`, `17`, `21`). The buildpack will download JDK and JRE assets that are compatible with this version of the JVM specification. Since the buildpack only ships a single version of each supported line, updates to the buildpack can change the exact version of the JDK or JRE. In order to hold the JDK and JRE versions stable, the buildpack version itself must be stable.<p/><p/>Buildpack releases (and the dependency versions for each release) can be found [here][bpv]. Few users will use this buildpack directly, instead consuming a language buildpack like `paketo-buildpacks/java` who's releases (and the individual buildpack versions and dependency versions for each release) can be found [here](https://github.com/paketo-buildpacks/java/releases). Finally, some users will consume builders like `paketobuildpacks/builder:base` whose releases can be found [here](https://hub.docker.com/r/paketobuildpacks/builder/tags?page=1&name=base). To determine the individual buildpack versions and dependency versions for each builder release use the [`pack inspect-builder <image>`](https://buildpacks.io/docs/reference/pack/pack_inspect-builder/) functionality. |
| `$BP_JVM_TYPE` | Configure the JVM type that is provided at runtime, i.e. a JDK or JRE - accepts values "JDK" or "JRE" (default). If a JRE type is requested but not available, a JDK will be provided. |
| `$BPL_JVM_HEAD_ROOM` | Configure the percentage of headroom the memory calculator will allocated. Defaults to `0`. |
| `$BPL_JVM_LOADED_CLASS_COUNT` | Configure the number of classes that will be loaded at runtime. Defaults to 35% of the number of classes. |
Expand Down
24 changes: 12 additions & 12 deletions buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,30 +199,30 @@ api = "0.7"
uri = "https://openjdk.java.net/legal/gplv2+ce.html"

[[metadata.dependencies]]
cpes = ["cpe:2.3:a:oracle:jdk:20.0.2:*:*:*:*:*:*:*"]
deprecation_date = "2023-09-30T00:00:00Z"
cpes = ["cpe:2.3:a:oracle:jdk:21.0.0:*:*:*:*:*:*:*"]
deprecation_date = "2028-09-30T00:00:00Z"
id = "jdk"
name = "SapMachine JDK"
purl = "pkg:generic/sap-machine-jdk@20.0.2?arch=amd64"
sha256 = "79a8e2bced58a45e70bb5d7e4cfdc8593bde6784f8c3b2587db26bb578e9bef1"
purl = "pkg:generic/sap-machine-jdk@21.0.0?arch=amd64"
sha256 = "3e5ccebadf96a5399c5bebdf5360260ade37b3a6d6ad76fa26f0552c57bbeea1"
stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"]
uri = "https://github.com/SAP/SapMachine/releases/download/sapmachine-20.0.2/sapmachine-jdk-20.0.2_linux-x64_bin.tar.gz"
version = "20.0.2"
uri = "https://github.com/SAP/SapMachine/releases/download/sapmachine-21/sapmachine-jdk-21_linux-x64_bin.tar.gz"
version = "21.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:20.0.2:*:*:*:*:*:*:*"]
deprecation_date = "2023-09-30T00:00:00Z"
cpes = ["cpe:2.3:a:oracle:jre:21.0.0:*:*:*:*:*:*:*"]
deprecation_date = "2028-09-30T00:00:00Z"
id = "jre"
name = "SapMachine JRE"
purl = "pkg:generic/sap-machine-jre@20.0.2?arch=amd64"
sha256 = "27797965f81909ee8907ec86d6d150d98fac8527aab5e942f403e40f09697b5a"
purl = "pkg:generic/sap-machine-jre@21.0.0?arch=amd64"
sha256 = "4d36b9f97a0f8d17b0193669d4e0c8f2957b73299c25ae5b9356fa429365ee26"
stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"]
uri = "https://github.com/SAP/SapMachine/releases/download/sapmachine-20.0.2/sapmachine-jre-20.0.2_linux-x64_bin.tar.gz"
version = "20.0.2"
uri = "https://github.com/SAP/SapMachine/releases/download/sapmachine-21/sapmachine-jre-21_linux-x64_bin.tar.gz"
version = "21.0.0"

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