From dd32494f831551f7dabd0f31d737a373351d2ff8 Mon Sep 17 00:00:00 2001 From: "heroku-linguist[bot]" <136119646+heroku-linguist[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:25:14 +0000 Subject: [PATCH] Update heroku/buildpacks-jvm to v4.0.0 (#424) * Update heroku/buildpacks-jvm to v4.0.0 ## heroku/gradle - No changes. ## heroku/java ### Removed - Removed `heroku/procfile`, since it's being added directly to the Heroku builder images instead. If you override the Heroku builder images' default buildpack detection order (or use this buildpack with a non-Heroku builder image), you will need to append `heroku/procfile` to your buildpacks list. ([#608](https://github.com/heroku/buildpacks-jvm/pull/608)) ### Changed - Updated `heroku/gradle` to `4.0.0`. - Updated `heroku/jvm` to `4.0.0`. - Updated `heroku/maven` to `4.0.0`. ## heroku/java-function ### Changed - Updated `heroku/jvm-function-invoker` to `4.0.0`. - Updated `heroku/jvm` to `4.0.0`. - Updated `heroku/maven` to `4.0.0`. ## heroku/jvm - No changes. ## heroku/jvm-function-invoker - No changes. ## heroku/maven - No changes. ## heroku/sbt - No changes. ## heroku/scala ### Removed - Removed `heroku/procfile`, since it's being added directly to the Heroku builder images instead. If you override the Heroku builder images' default buildpack detection order (or use this buildpack with a non-Heroku builder image), you will need to append `heroku/procfile` to your buildpacks list. ([#608](https://github.com/heroku/buildpacks-jvm/pull/608)) ### Changed - Updated `heroku/jvm` to `4.0.0`. - Updated `heroku/sbt` to `4.0.0`. * Add `heroku/procfile` to the `heroku/java` and `heroku/scala` order groups Since the Procfile CNB is no longer included in them, as of: https://github.com/heroku/buildpacks-jvm/pull/608 --------- Co-authored-by: heroku-linguist[bot] <136119646+heroku-linguist[bot]@users.noreply.github.com> Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com> --- builder-20/builder.toml | 18 +++++++++++++----- builder-22/builder.toml | 18 +++++++++++++----- buildpacks-20/builder.toml | 8 ++++++-- salesforce-functions/builder.toml | 4 ++-- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/builder-20/builder.toml b/builder-20/builder.toml index e0a634b6..27594444 100644 --- a/builder-20/builder.toml +++ b/builder-20/builder.toml @@ -14,7 +14,7 @@ version = "0.17.2" [[buildpacks]] id = "heroku/java" - uri = "docker://docker.io/heroku/buildpack-java@sha256:879f16193c5f235471322020b71af8e3a814f25c82305cdb44f83470e0db6f8f" + uri = "docker://docker.io/heroku/buildpack-java@sha256:afaf284205f547c4453968f9872b5d44d94154680d4799648816681597b742f3" [[buildpacks]] id = "heroku/nodejs" @@ -38,7 +38,7 @@ version = "0.17.2" [[buildpacks]] id = "heroku/scala" - uri = "docker://docker.io/heroku/buildpack-scala@sha256:df96a056246c7f4f4c9091da2e56dc5ae1f5f22ad215d5cbc42cc312ec8cdcdd" + uri = "docker://docker.io/heroku/buildpack-scala@sha256:5ae9a74a8117d559f9b71d7c0b783fa23db8936bc8ffd3b4dccf02fc6ed1fa06" [[order]] [[order.group]] @@ -60,7 +60,7 @@ version = "0.17.2" optional = true [[order.group]] id = "heroku/jvm" - version = "3.2.2" + version = "4.0.0" optional = true [[order.group]] id = "heroku/ruby" @@ -82,12 +82,20 @@ version = "0.17.2" [[order]] [[order.group]] id = "heroku/java" - version = "3.2.2" + version = "4.0.0" + [[order.group]] + id = "heroku/procfile" + version = "2.0.2" + optional = true [[order]] [[order.group]] id = "heroku/scala" - version = "3.2.2" + version = "4.0.0" + [[order.group]] + id = "heroku/procfile" + version = "2.0.2" + optional = true [[order]] [[order.group]] diff --git a/builder-22/builder.toml b/builder-22/builder.toml index 6e8fdd00..5be63475 100644 --- a/builder-22/builder.toml +++ b/builder-22/builder.toml @@ -14,7 +14,7 @@ version = "0.17.2" [[buildpacks]] id = "heroku/java" - uri = "docker://docker.io/heroku/buildpack-java@sha256:879f16193c5f235471322020b71af8e3a814f25c82305cdb44f83470e0db6f8f" + uri = "docker://docker.io/heroku/buildpack-java@sha256:afaf284205f547c4453968f9872b5d44d94154680d4799648816681597b742f3" [[buildpacks]] id = "heroku/nodejs" @@ -38,7 +38,7 @@ version = "0.17.2" [[buildpacks]] id = "heroku/scala" - uri = "docker://docker.io/heroku/buildpack-scala@sha256:df96a056246c7f4f4c9091da2e56dc5ae1f5f22ad215d5cbc42cc312ec8cdcdd" + uri = "docker://docker.io/heroku/buildpack-scala@sha256:5ae9a74a8117d559f9b71d7c0b783fa23db8936bc8ffd3b4dccf02fc6ed1fa06" [[order]] [[order.group]] @@ -60,7 +60,7 @@ version = "0.17.2" optional = true [[order.group]] id = "heroku/jvm" - version = "3.2.2" + version = "4.0.0" optional = true [[order.group]] id = "heroku/ruby" @@ -82,12 +82,20 @@ version = "0.17.2" [[order]] [[order.group]] id = "heroku/java" - version = "3.2.2" + version = "4.0.0" + [[order.group]] + id = "heroku/procfile" + version = "2.0.2" + optional = true [[order]] [[order.group]] id = "heroku/scala" - version = "3.2.2" + version = "4.0.0" + [[order.group]] + id = "heroku/procfile" + version = "2.0.2" + optional = true [[order]] [[order.group]] diff --git a/buildpacks-20/builder.toml b/buildpacks-20/builder.toml index acc55ada..5c3fbe70 100644 --- a/buildpacks-20/builder.toml +++ b/buildpacks-20/builder.toml @@ -18,7 +18,7 @@ version = "0.17.2" [[buildpacks]] id = "heroku/java" - uri = "docker://docker.io/heroku/buildpack-java@sha256:879f16193c5f235471322020b71af8e3a814f25c82305cdb44f83470e0db6f8f" + uri = "docker://docker.io/heroku/buildpack-java@sha256:afaf284205f547c4453968f9872b5d44d94154680d4799648816681597b742f3" [[buildpacks]] id = "heroku/nodejs" @@ -101,4 +101,8 @@ version = "0.17.2" [[order]] [[order.group]] id = "heroku/java" - version = "3.2.2" + version = "4.0.0" + [[order.group]] + id = "heroku/procfile" + version = "2.0.2" + optional = true diff --git a/salesforce-functions/builder.toml b/salesforce-functions/builder.toml index 1086307d..461a657c 100644 --- a/salesforce-functions/builder.toml +++ b/salesforce-functions/builder.toml @@ -10,7 +10,7 @@ version = "0.17.2" [[buildpacks]] id = "heroku/java-function" - uri = "docker://docker.io/heroku/buildpack-java-function@sha256:56df8e921781f621b6a57515ffa207c684f73e2f222f7fa3ed64d23a1f22aba6" + uri = "docker://docker.io/heroku/buildpack-java-function@sha256:65e15118e97da96e3391ddc9bed230408679719fb4410abcaeff13ef2741a0d8" [[buildpacks]] id = "heroku/nodejs-function" @@ -24,4 +24,4 @@ version = "0.17.2" [[order]] [[order.group]] id = "heroku/java-function" - version = "3.2.2" + version = "4.0.0"