From 3d502e504f9c4a937ef0ee618f98165f33f186fb Mon Sep 17 00:00:00 2001
From: Daniel Mikusa <dmikusa@vmware.com>
Date: Mon, 1 Nov 2021 16:07:10 -0400
Subject: [PATCH] Remove Java 16

Signed-off-by: Daniel Mikusa <dmikusa@vmware.com>
---
 .github/pipeline-descriptor.yml     |   8 ---
 .github/workflows/update-jdk-16.yml | 104 ----------------------------
 buildpack.toml                      |  12 ----
 3 files changed, 124 deletions(-)
 delete mode 100644 .github/workflows/update-jdk-16.yml

diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml
index fccb62b..17dd41a 100644
--- a/.github/pipeline-descriptor.yml
+++ b/.github/pipeline-descriptor.yml
@@ -49,14 +49,6 @@ dependencies:
     implementation: hotspot
     type:           jre
     version:        "[11,12)"
-- name:            JDK 16
-  id:              jdk
-  version_pattern: "16\\.[\\d]+\\.[\\d]+"
-  uses:            docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main
-  with:
-    implementation: hotspot
-    type:           jdk
-    version:        "[16,17)"
 - name:            JDK 17
   id:              jdk
   version_pattern: "17\\.[\\d]+\\.[\\d]+"
diff --git a/.github/workflows/update-jdk-16.yml b/.github/workflows/update-jdk-16.yml
deleted file mode 100644
index 60484eb..0000000
--- a/.github/workflows/update-jdk-16.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-name: Update JDK 16
-"on":
-    schedule:
-        - cron: 0 5 * * 1-5
-    workflow_dispatch: {}
-jobs:
-    update:
-        name: Update Buildpack Dependency
-        runs-on:
-            - ubuntu-latest
-        steps:
-            - uses: actions/setup-go@v2
-              with:
-                go-version: "1.16"
-            - name: Install update-buildpack-dependency
-              run: |
-                #!/usr/bin/env bash
-
-                set -euo pipefail
-
-                GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency
-            - name: Install yj
-              run: |
-                #!/usr/bin/env bash
-
-                set -euo pipefail
-
-                echo "Installing yj ${YJ_VERSION}"
-
-                mkdir -p "${HOME}"/bin
-                echo "${HOME}/bin" >> "${GITHUB_PATH}"
-
-                curl \
-                  --location \
-                  --show-error \
-                  --silent \
-                  --output "${HOME}"/bin/yj \
-                  "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux"
-
-                chmod +x "${HOME}"/bin/yj
-              env:
-                YJ_VERSION: 5.0.0
-            - uses: actions/checkout@v2
-            - id: dependency
-              uses: docker://ghcr.io/paketo-buildpacks/actions/adoptium-dependency:main
-              with:
-                implementation: hotspot
-                type: jdk
-                version: '[16,17)'
-            - name: Update Buildpack Dependency
-              id: buildpack
-              run: |-
-                #!/usr/bin/env bash
-
-                set -euo pipefail
-
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
-
-                update-buildpack-dependency \
-                  --buildpack-toml buildpack.toml \
-                  --id "${ID}" \
-                  --version-pattern "${VERSION_PATTERN}" \
-                  --version "${VERSION}" \
-                  --uri "${URI}" \
-                  --sha256 "${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 "::set-output name=old-version::${OLD_VERSION}"
-                echo "::set-output name=new-version::${VERSION}"
-                echo "::set-output name=version-label::${LABEL}"
-              env:
-                ID: jdk
-                SHA256: ${{ steps.dependency.outputs.sha256 }}
-                URI: ${{ steps.dependency.outputs.uri }}
-                VERSION: ${{ steps.dependency.outputs.version }}
-                VERSION_PATTERN: 16\.[\d]+\.[\d]+
-            - uses: peter-evans/create-pull-request@v3
-              with:
-                author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
-                body: Bumps `JDK 16` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
-                branch: update/buildpack/jdk-16
-                commit-message: |-
-                    Bump JDK 16 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-
-                    Bumps JDK 16 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 16 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-                token: ${{ secrets.JAVA_GITHUB_TOKEN }}
diff --git a/buildpack.toml b/buildpack.toml
index 4a9494a..e2c3d32 100644
--- a/buildpack.toml
+++ b/buildpack.toml
@@ -173,18 +173,6 @@ api = "0.6"
       type = "GPL-2.0 WITH Classpath-exception-2.0"
       uri = "https://openjdk.java.net/legal/gplv2+ce.html"
 
-  [[metadata.dependencies]]
-    id = "jdk"
-    name = "Adoptium JDK"
-    sha256 = "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c"
-    stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"]
-    uri = "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
-    version = "16.0.2"
-
-    [[metadata.dependencies.licenses]]
-      type = "GPL-2.0 WITH Classpath-exception-2.0"
-      uri = "https://openjdk.java.net/legal/gplv2+ce.html"
-
   [[metadata.dependencies]]
     id = "jdk"
     name = "Adoptium JDK"