diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml
index a596058..1d731b9 100644
--- a/.github/pipeline-descriptor.yml
+++ b/.github/pipeline-descriptor.yml
@@ -86,3 +86,19 @@ dependencies:
implementation: hotspot
type: jre
version: "[21,22)"
+- name: JDK 22
+ id: jdk
+ version_pattern: "22\\.[\\d]+\\.[\\d]+"
+ uses: docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main
+ with:
+ implementation: hotspot
+ type: jdk
+ version: "[22,23)"
+- name: JRE 22
+ id: jre
+ version_pattern: "22\\.[\\d]+\\.[\\d]+"
+ uses: docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main
+ with:
+ implementation: hotspot
+ type: jre
+ version: "[22,23)"
\ No newline at end of file
diff --git a/.github/workflows/pb-update-jdk-22.yml b/.github/workflows/pb-update-jdk-22.yml
new file mode 100644
index 0000000..3e301b1
--- /dev/null
+++ b/.github/workflows/pb-update-jdk-22.yml
@@ -0,0 +1,104 @@
+name: Update JDK 22
+"on":
+ schedule:
+ - cron: 0 5 * * 1-5
+ workflow_dispatch: {}
+jobs:
+ update:
+ name: Update Buildpack Dependency
+ runs-on:
+ - ubuntu-latest
+ steps:
+ - uses: actions/setup-go@v5
+ with:
+ go-version: "1.20"
+ - name: Install update-buildpack-dependency
+ run: |
+ #!/usr/bin/env bash
+
+ set -euo pipefail
+
+ go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
+ - uses: buildpacks/github-actions/setup-tools@v5.5.3
+ with:
+ crane-version: 0.19.0
+ yj-version: 5.1.0
+ - uses: actions/checkout@v4
+ - id: dependency
+ uses: docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main
+ with:
+ implementation: hotspot
+ type: jdk
+ version: '[22,23)'
+ - name: Update Buildpack Dependency
+ id: buildpack
+ run: |
+ #!/usr/bin/env bash
+
+ set -euo pipefail
+
+ VERSION_DEPS=$(yj -tj < buildpack.toml | jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) )")
+ ARCH=${ARCH:-amd64}
+ OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r 'select( .purl | contains( env.ARCH ) ) | .version')
+
+ if [ -z "$OLD_VERSION" ]; then
+ ARCH="" # empty means noarch
+ OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version")
+ fi
+
+ update-buildpack-dependency \
+ --buildpack-toml buildpack.toml \
+ --id "${ID}" \
+ --arch "${ARCH}" \
+ --version-pattern "${VERSION_PATTERN}" \
+ --version "${VERSION}" \
+ --cpe-pattern "${CPE_PATTERN:-}" \
+ --cpe "${CPE:-}" \
+ --purl-pattern "${PURL_PATTERN:-}" \
+ --purl "${PURL:-}" \
+ --uri "${URI}" \
+ --sha256 "${SHA256}" \
+ --source "${SOURCE_URI}" \
+ --source-sha256 "${SOURCE_SHA256}"
+
+ git add buildpack.toml
+ git checkout -- .
+
+ if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then
+ LABEL="semver:major"
+ elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then
+ LABEL="semver:minor"
+ else
+ LABEL="semver:patch"
+ fi
+
+ echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
+ echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
+ echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
+ env:
+ ARCH: ""
+ CPE: ${{ steps.dependency.outputs.cpe }}
+ CPE_PATTERN: ""
+ ID: jdk
+ PURL: ${{ steps.dependency.outputs.purl }}
+ PURL_PATTERN: ""
+ SHA256: ${{ steps.dependency.outputs.sha256 }}
+ SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
+ SOURCE_URI: ${{ steps.dependency.outputs.source }}
+ URI: ${{ steps.dependency.outputs.uri }}
+ VERSION: ${{ steps.dependency.outputs.version }}
+ VERSION_PATTERN: 22\.[\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
+ commit-message: |-
+ Bump JDK 22 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 }}.
+ 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 }}
+ token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-jre-22.yml b/.github/workflows/pb-update-jre-22.yml
new file mode 100644
index 0000000..20d6d52
--- /dev/null
+++ b/.github/workflows/pb-update-jre-22.yml
@@ -0,0 +1,104 @@
+name: Update JRE 22
+"on":
+ schedule:
+ - cron: 0 5 * * 1-5
+ workflow_dispatch: {}
+jobs:
+ update:
+ name: Update Buildpack Dependency
+ runs-on:
+ - ubuntu-latest
+ steps:
+ - uses: actions/setup-go@v5
+ with:
+ go-version: "1.20"
+ - name: Install update-buildpack-dependency
+ run: |
+ #!/usr/bin/env bash
+
+ set -euo pipefail
+
+ go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
+ - uses: buildpacks/github-actions/setup-tools@v5.5.3
+ with:
+ crane-version: 0.19.0
+ yj-version: 5.1.0
+ - uses: actions/checkout@v4
+ - id: dependency
+ uses: docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main
+ with:
+ implementation: hotspot
+ type: jre
+ version: '[22,23)'
+ - name: Update Buildpack Dependency
+ id: buildpack
+ run: |
+ #!/usr/bin/env bash
+
+ set -euo pipefail
+
+ VERSION_DEPS=$(yj -tj < buildpack.toml | jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) )")
+ ARCH=${ARCH:-amd64}
+ OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r 'select( .purl | contains( env.ARCH ) ) | .version')
+
+ if [ -z "$OLD_VERSION" ]; then
+ ARCH="" # empty means noarch
+ OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version")
+ fi
+
+ update-buildpack-dependency \
+ --buildpack-toml buildpack.toml \
+ --id "${ID}" \
+ --arch "${ARCH}" \
+ --version-pattern "${VERSION_PATTERN}" \
+ --version "${VERSION}" \
+ --cpe-pattern "${CPE_PATTERN:-}" \
+ --cpe "${CPE:-}" \
+ --purl-pattern "${PURL_PATTERN:-}" \
+ --purl "${PURL:-}" \
+ --uri "${URI}" \
+ --sha256 "${SHA256}" \
+ --source "${SOURCE_URI}" \
+ --source-sha256 "${SOURCE_SHA256}"
+
+ git add buildpack.toml
+ git checkout -- .
+
+ if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then
+ LABEL="semver:major"
+ elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then
+ LABEL="semver:minor"
+ else
+ LABEL="semver:patch"
+ fi
+
+ echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
+ echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
+ echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
+ env:
+ ARCH: ""
+ CPE: ${{ steps.dependency.outputs.cpe }}
+ CPE_PATTERN: ""
+ ID: jre
+ PURL: ${{ steps.dependency.outputs.purl }}
+ PURL_PATTERN: ""
+ SHA256: ${{ steps.dependency.outputs.sha256 }}
+ SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
+ SOURCE_URI: ${{ steps.dependency.outputs.source }}
+ URI: ${{ steps.dependency.outputs.uri }}
+ VERSION: ${{ steps.dependency.outputs.version }}
+ VERSION_PATTERN: 22\.[\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 `JRE 22` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
+ branch: update/buildpack/jre-22
+ commit-message: |-
+ Bump JRE 22 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
+
+ Bumps JRE 22 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 22 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
+ token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/README.md b/README.md
index d6772d9..ec25755 100644
--- a/README.md
+++ b/README.md
@@ -43,27 +43,27 @@ The buildpack will do the following if a JRE is requested:
## Configuration
-| Environment Variable | Description |
-| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `$BP_JVM_VERSION` | Configure the JVM version (e.g. `8`, `11`, `17`, `20`). 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.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 will consume builders like `paketobuildpacks/builder:base` who's 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 `](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. |
-| `$BPL_JVM_CLASS_ADJUSTMENT` | Absolute or percentage based adjustment of the memory calculator's class count, which influences various memory settings of the JVM. This is useful when the number of classes cannot be reliably determined during build-time and workloads run into OOM situations. Defaults to `100%`. |
-| `$BPL_JVM_THREAD_COUNT` | Configure the number of user threads at runtime. Defaults to `250`. |
-| `$BPL_HEAP_DUMP_PATH` | Configure the location for writing heap dumps in the event of an OutOfMemoryError exception. Defaults to ``, which disables writing heap dumps. The path set must be writable by the JVM process. |
-| `$BPL_JAVA_NMT_ENABLED` | Configure whether Java Native Memory Tracking (NMT) is enabled. Defaults to `true`. Set this to `false` to disable NMT functionality. |
-| `$BPL_JAVA_NMT_LEVEL` | Configure the level of detail for Java Native Memory Tracking (NMT) output. Defaults to `summary`. Set this to `detail` for detailed NMT output. |
-| `$BPL_JMX_ENABLED` | Configure whether Java Management Extensions (JMX) is enabled. Defaults to `false`. Set this to `true` to enable JMX functionality. |
-| `$BPL_JMX_PORT` | Configure the port number for JMX. Defaults to `5000`. When running the container, this value should match the port published locally, i.e. for Docker: --publish 5000:5000 |
-| `$BPL_DEBUG_ENABLED` | Configure whether remote debugging features are enabled. Defaults to `false`. Set this to `true` to enable remote debugging. |
-| `$BPL_DEBUG_PORT` | Configure the port number for remote debugging. Defaults to `8000`.
-| `$BPL_DEBUG_SUSPEND` | Configure whether to suspend execution until a debugger has attached. Defaults to `false`.
-| `$BPL_JFR_ENABLED` | Configure whether Java Flight Recording (JFR) is enabled. If no arguments are specified via `BPL_JFR_ARGS`, the default config args `dumponexit=true,filename=/tmp/recording.jfr` are added.
-| `$BPL_JFR_ARGS` | Configure custom arguments to Java Flight Recording, via a comma-separated list, e.g. `duration=10s,maxage=1m`. If any values are specified, no default args are supplied.
-| `$BP_JVM_JLINK_ENABLED` | Configures whether to run the JDK's jlink tool at build time to generate a custom JRE. Defaults to `false`. If no custom args are specified, the default args are `--no-man-pages --no-header-files --strip-debug --compress=1`.
-| `$BP_JVM_JLINK_ARGS` | Configure custom arguments to supply to the jlink tool. If any custom args are specified, no default args are supplied.
-| `$JAVA_TOOL_OPTIONS` | Configure the JVM launch flags |
+| Environment Variable | Description |
+| ----------------------------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `$BP_JVM_VERSION` | Configure the JVM version (e.g. `8`, `11`, `17`, `21`, `22`). 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.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 will consume builders like `paketobuildpacks/builder:base` who's 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 `](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. |
+| `$BPL_JVM_CLASS_ADJUSTMENT` | Absolute or percentage based adjustment of the memory calculator's class count, which influences various memory settings of the JVM. This is useful when the number of classes cannot be reliably determined during build-time and workloads run into OOM situations. Defaults to `100%`. |
+| `$BPL_JVM_THREAD_COUNT` | Configure the number of user threads at runtime. Defaults to `250`. |
+| `$BPL_HEAP_DUMP_PATH` | Configure the location for writing heap dumps in the event of an OutOfMemoryError exception. Defaults to ``, which disables writing heap dumps. The path set must be writable by the JVM process. |
+| `$BPL_JAVA_NMT_ENABLED` | Configure whether Java Native Memory Tracking (NMT) is enabled. Defaults to `true`. Set this to `false` to disable NMT functionality. |
+| `$BPL_JAVA_NMT_LEVEL` | Configure the level of detail for Java Native Memory Tracking (NMT) output. Defaults to `summary`. Set this to `detail` for detailed NMT output. |
+| `$BPL_JMX_ENABLED` | Configure whether Java Management Extensions (JMX) is enabled. Defaults to `false`. Set this to `true` to enable JMX functionality. |
+| `$BPL_JMX_PORT` | Configure the port number for JMX. Defaults to `5000`. When running the container, this value should match the port published locally, i.e. for Docker: --publish 5000:5000 |
+| `$BPL_DEBUG_ENABLED` | Configure whether remote debugging features are enabled. Defaults to `false`. Set this to `true` to enable remote debugging. |
+| `$BPL_DEBUG_PORT` | Configure the port number for remote debugging. Defaults to `8000`.
+| `$BPL_DEBUG_SUSPEND` | Configure whether to suspend execution until a debugger has attached. Defaults to `false`.
+| `$BPL_JFR_ENABLED` | Configure whether Java Flight Recording (JFR) is enabled. If no arguments are specified via `BPL_JFR_ARGS`, the default config args `dumponexit=true,filename=/tmp/recording.jfr` are added.
+| `$BPL_JFR_ARGS` | Configure custom arguments to Java Flight Recording, via a comma-separated list, e.g. `duration=10s,maxage=1m`. If any values are specified, no default args are supplied.
+| `$BP_JVM_JLINK_ENABLED` | Configures whether to run the JDK's jlink tool at build time to generate a custom JRE. Defaults to `false`. If no custom args are specified, the default args are `--no-man-pages --no-header-files --strip-debug --compress=1`.
+| `$BP_JVM_JLINK_ARGS` | Configure custom arguments to supply to the jlink tool. If any custom args are specified, no default args are supplied.
+| `$JAVA_TOOL_OPTIONS` | Configure the JVM launch flags |
[bpv]: https://github.com/paketo-buildpacks/adoptium/releases
diff --git a/buildpack.toml b/buildpack.toml
index a5874ca..69e7bf2 100644
--- a/buildpack.toml
+++ b/buildpack.toml
@@ -266,5 +266,37 @@ api = "0.7"
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:jdk:22.0.0:*:*:*:*:*:*:*"]
+ id = "jdk"
+ name = "Adoptium JDK"
+ purl = "pkg:generic/adoptium-dk@22.0.0?arch=amd64"
+ sha256 = "bc3d99e816d0c373f424cd7aa2b6d3e8081a7189fe55c1561616922200ec8e47"
+ source = "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22%2B36/OpenJDK22U-jdk-sources_22_36.tar.gz"
+ source-sha256 = "40e65125ca6d218f97be74cc08f174307eb324880adce9051cb0a3b2581fa95f"
+ stacks = ["*"]
+ uri = "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22%2B36/OpenJDK22U-jdk_x64_linux_hotspot_22_36.tar.gz"
+ version = "22.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:22.0.0:*:*:*:*:*:*:*"]
+ id = "jre"
+ name = "Adoptium JRE"
+ purl = "pkg:generic/adoptium-jre@22.0.0?arch=amd64"
+ sha256 = "faceda94ffd16e177cb674471f29789e48378f9f190eac8523713a0cb3324be9"
+ source = "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22%2B36/OpenJDK22U-jdk-sources_22_36.tar.gz"
+ source-sha256 = "40e65125ca6d218f97be74cc08f174307eb324880adce9051cb0a3b2581fa95f"
+ stacks = ["*"]
+ uri = "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22%2B36/OpenJDK22U-jre_x64_linux_hotspot_22_36.tar.gz"
+ version = "22.0.0"
+
+ [[metadata.dependencies.licenses]]
+ type = "GPL-2.0 WITH Classpath-exception-2.0"
+ uri = "https://openjdk.java.net/legal/gplv2+ce.html"
+
[[stacks]]
id = "*"