From 61082347b1f565290f24b06f34a17645e8c3abea Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:58:27 +0000
Subject: [PATCH] Update Procfile CNB to v2.0.1 (#568)

Since there has been a new Procfile CNB release:
https://github.com/heroku/procfile-cnb/releases/tag/v2.0.1
https://github.com/heroku/procfile-cnb/compare/v2.0.0...v2.0.1

Also:
- Uses an explicit Procfile CNB version in tests, to prevent test
  failures when the builder image contains multiple versions
  (which is the cause of the CI failures currently seen on `main`).
- Switches the buildpack URI to using the image SHA256, for
  parity with the URI used in `heroku/builder`.

GUS-W-13982665.
---
 buildpacks/sbt/tests/integration/main.rs | 4 +++-
 meta-buildpacks/java/CHANGELOG.md        | 2 ++
 meta-buildpacks/java/buildpack.toml      | 2 +-
 meta-buildpacks/java/package.toml        | 2 +-
 meta-buildpacks/scala/CHANGELOG.md       | 2 ++
 meta-buildpacks/scala/buildpack.toml     | 2 +-
 meta-buildpacks/scala/package.toml       | 2 +-
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/buildpacks/sbt/tests/integration/main.rs b/buildpacks/sbt/tests/integration/main.rs
index 75276869..bb149930 100644
--- a/buildpacks/sbt/tests/integration/main.rs
+++ b/buildpacks/sbt/tests/integration/main.rs
@@ -16,6 +16,8 @@ pub(crate) fn default_buildpacks() -> Vec<BuildpackReference> {
     vec![
         BuildpackReference::Other(String::from("heroku/jvm")),
         BuildpackReference::Crate,
-        BuildpackReference::Other(String::from("heroku/procfile")),
+        // Using an explicit version from Docker Hub to prevent failures when there
+        // are multiple Procfile buildpack versions in the builder image.
+        BuildpackReference::Other(String::from("docker://docker.io/heroku/procfile-cnb:2.0.1")),
     ]
 }
diff --git a/meta-buildpacks/java/CHANGELOG.md b/meta-buildpacks/java/CHANGELOG.md
index fef8cd3e..01e79280 100644
--- a/meta-buildpacks/java/CHANGELOG.md
+++ b/meta-buildpacks/java/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Updated `heroku/procfile` to `2.0.1`. ([#568](https://github.com/heroku/buildpacks-jvm/pull/568))
+
 ## [3.0.0] - 2023-08-09
 
 - Updated `heroku/jvm` to `3.0.0`.
diff --git a/meta-buildpacks/java/buildpack.toml b/meta-buildpacks/java/buildpack.toml
index 32bc5761..b3292534 100644
--- a/meta-buildpacks/java/buildpack.toml
+++ b/meta-buildpacks/java/buildpack.toml
@@ -23,7 +23,7 @@ version = "3.0.0"
 
 [[order.group]]
 id = "heroku/procfile"
-version = "2.0.0"
+version = "2.0.1"
 optional = true
 
 [metadata]
diff --git a/meta-buildpacks/java/package.toml b/meta-buildpacks/java/package.toml
index 5ae43447..e57b6cbc 100644
--- a/meta-buildpacks/java/package.toml
+++ b/meta-buildpacks/java/package.toml
@@ -8,4 +8,4 @@ uri = "libcnb:heroku/jvm"
 uri = "libcnb:heroku/maven"
 
 [[dependencies]]
-uri = "docker://docker.io/heroku/procfile-cnb:2.0.0"
+uri = "docker://docker.io/heroku/procfile-cnb@sha256:ea7219d4bb50196b4f292c9aae397b17255c59a243d7408535d2a03a5cd2b040"
diff --git a/meta-buildpacks/scala/CHANGELOG.md b/meta-buildpacks/scala/CHANGELOG.md
index 7bc6a03a..e436c87b 100644
--- a/meta-buildpacks/scala/CHANGELOG.md
+++ b/meta-buildpacks/scala/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Updated `heroku/procfile` to `2.0.1`. ([#568](https://github.com/heroku/buildpacks-jvm/pull/568))
+
 ## [3.0.0] - 2023-08-09
 
 - Updated `heroku/jvm` to `3.0.0`.
diff --git a/meta-buildpacks/scala/buildpack.toml b/meta-buildpacks/scala/buildpack.toml
index b98e088c..3458bb2e 100644
--- a/meta-buildpacks/scala/buildpack.toml
+++ b/meta-buildpacks/scala/buildpack.toml
@@ -23,7 +23,7 @@ version = "3.0.0"
 
 [[order.group]]
 id = "heroku/procfile"
-version = "2.0.0"
+version = "2.0.1"
 optional = true
 
 [metadata]
diff --git a/meta-buildpacks/scala/package.toml b/meta-buildpacks/scala/package.toml
index 5e8bbca7..c28f4c62 100644
--- a/meta-buildpacks/scala/package.toml
+++ b/meta-buildpacks/scala/package.toml
@@ -8,4 +8,4 @@ uri = "libcnb:heroku/jvm"
 uri = "libcnb:heroku/sbt"
 
 [[dependencies]]
-uri = "docker://docker.io/heroku/procfile-cnb:2.0.0"
+uri = "docker://docker.io/heroku/procfile-cnb@sha256:ea7219d4bb50196b4f292c9aae397b17255c59a243d7408535d2a03a5cd2b040"