From 270dd160fb9edc03258db2592945d863e227f05c Mon Sep 17 00:00:00 2001
From: "heroku-linguist[bot]"
 <136119646+heroku-linguist[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 08:33:52 +0000
Subject: [PATCH] Update heroku/buildpacks-jvm to v3.1.0 (#381)

* Update heroku/buildpacks-jvm to v3.1.0

## heroku/gradle

### Added

* Initial release

## heroku/java

- Updated `heroku/procfile` to `2.0.1`. ([#568](https://github.com/heroku/buildpacks-jvm/pull/568))
- Updated `heroku/gradle` to `3.1.0`.
- Updated `heroku/jvm` to `3.1.0`.
- Updated `heroku/maven` to `3.1.0`.

## heroku/java-function

- Updated `heroku/jvm-function-invoker` to `3.1.0`.
- Updated `heroku/jvm` to `3.1.0`.
- Updated `heroku/maven` to `3.1.0`.

## heroku/jvm

* Default version for **OpenJDK 11** is now `11.0.20.1`. ([#582](https://github.com/heroku/buildpacks-jvm/pull/582))
* Default version for **OpenJDK 17** is now `17.0.8.1`. ([#582](https://github.com/heroku/buildpacks-jvm/pull/582))

## heroku/jvm-function-invoker

- No changes.

## heroku/maven

- No changes.

## heroku/sbt

- No changes.

## heroku/scala

- Updated `heroku/procfile` to `2.0.1`. ([#568](https://github.com/heroku/buildpacks-jvm/pull/568))
- Updated `heroku/jvm` to `3.1.0`.
- Updated `heroku/sbt` to `3.1.0`.

* Tweaks after Gradle CNB availability

---------

Co-authored-by: heroku-linguist[bot] <136119646+heroku-linguist[bot]@users.noreply.github.com>
Co-authored-by: Manuel Fuchs <manuel.fuchs@salesforce.com>
---
 .github/workflows/build-test-publish.yml |  3 ---
 builder-22/builder.toml                  | 14 +++++++-------
 buildpacks-20/builder.toml               | 22 ++--------------------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
index 3d29a752..5c93f0e3 100644
--- a/.github/workflows/build-test-publish.yml
+++ b/.github/workflows/build-test-publish.yml
@@ -54,9 +54,6 @@ jobs:
         include:
           - builder: builder-classic-22
             language: clojure
-        exclude:
-          - builder: builder-22
-            language: gradle
     steps:
       - name: Checkout getting started guide
         uses: actions/checkout@v3
diff --git a/builder-22/builder.toml b/builder-22/builder.toml
index 105655c4..459262e7 100644
--- a/builder-22/builder.toml
+++ b/builder-22/builder.toml
@@ -22,15 +22,15 @@ version = "0.17.0"
 
 [[buildpacks]]
   id = "heroku/java"
-  uri = "docker://docker.io/heroku/buildpack-java@sha256:7e4a2bc5f80e6892949117e3ae48ecac0b54760058999c48a5907a56268949fe"
+  uri = "docker://docker.io/heroku/buildpack-java@sha256:01ee978c56689f0ea53b35d07469a3f66a8511e1c44f13e147dea1351cbe80d5"
 
 [[buildpacks]]
   id = "heroku/java-function"
-  uri = "docker://docker.io/heroku/buildpack-java-function@sha256:5025f31347af8d3642701ab416c3f1c5278775538f2d8e3d82ed1e03ea3de533"
+  uri = "docker://docker.io/heroku/buildpack-java-function@sha256:ad2473a262fc8e203772dd3b9bf3df897e8d1f127999110a4e31d593be3c37dc"
 
 [[buildpacks]]
   id = "heroku/scala"
-  uri = "docker://docker.io/heroku/buildpack-scala@sha256:5210d085d5b39e196fe7e0f8463fb06f96dc2e007ae985e11e92059a1e3b1183"
+  uri = "docker://docker.io/heroku/buildpack-scala@sha256:29f07ab589057a21cb2cd8628a8b56ffe76a9084f9cdaabe338468c27e23a372"
 
 [[buildpacks]]
   id = "heroku/go"
@@ -68,7 +68,7 @@ version = "0.17.0"
     optional = true
   [[order.group]]
     id = "heroku/jvm"
-    version = "3.0.0"
+    version = "3.1.0"
     optional = true
   [[order.group]]
     id = "heroku/ruby"
@@ -91,17 +91,17 @@ version = "0.17.0"
 [[order]]
   [[order.group]]
     id = "heroku/java-function"
-    version = "3.0.0"
+    version = "3.1.0"
 
 [[order]]
   [[order.group]]
     id = "heroku/java"
-    version = "3.0.0"
+    version = "3.1.0"
 
 [[order]]
   [[order.group]]
     id = "heroku/scala"
-    version = "3.0.0"
+    version = "3.1.0"
 
 [[order]]
   [[order.group]]
diff --git a/buildpacks-20/builder.toml b/buildpacks-20/builder.toml
index 2db2688c..ecf19359 100644
--- a/buildpacks-20/builder.toml
+++ b/buildpacks-20/builder.toml
@@ -10,7 +10,7 @@ version = "0.17.0"
 
 [[buildpacks]]
   id = "heroku/java"
-  uri = "docker://docker.io/heroku/buildpack-java@sha256:7e4a2bc5f80e6892949117e3ae48ecac0b54760058999c48a5907a56268949fe"
+  uri = "docker://docker.io/heroku/buildpack-java@sha256:01ee978c56689f0ea53b35d07469a3f66a8511e1c44f13e147dea1351cbe80d5"
 
 [[buildpacks]]
   id = "heroku/scala"
@@ -102,22 +102,4 @@ version = "0.17.0"
 [[order]]
   [[order.group]]
     id = "heroku/java"
-    version = "3.0.0"
-
-# heroku/java previously supported Gradle by mixing in the shimmed heroku/gradle buildpack. When we decided to make a
-# clean cut and not have shimmed buildpacks in the CNB repository, support for Gradle in heroku/java was dropped.
-# To maintain backwards compatibility, we have this order definition here that mirrors what was in heroku/java
-# previously. It can be removed when the heroku/java CNB supports Gradle again.
-[[order]]
-  [[order.group]]
-    id = "heroku/jvm"
-    version = "3.0.0"
-
-  [[order.group]]
-    id = "heroku/gradle"
-    version = "0.0.0"
-
-  [[order.group]]
-    id = "heroku/procfile"
-    version = "2.0.1"
-    optional = true
+    version = "3.1.0"