From c5bb83c6d0b503e586eb5693803ca1f0156fd9be Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 23 May 2021 12:28:42 -0500
Subject: [PATCH] ci: deprecated java15 since java16 is now primary

---
 .github/workflows/build-multiarch.yml | 2 --
 README.md                             | 2 --
 docker-versions-create.sh             | 1 -
 3 files changed, 5 deletions(-)

diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 5a859a25..9311a321 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -7,7 +7,6 @@ on:
       - "multiarch*"
       - java8-openj9
       - java11*
-      - java15*
       - java16*
       - test/multiarch/*
     tags:
@@ -16,7 +15,6 @@ on:
       - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
       - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-java11*"
-      - "[0-9]+.[0-9]+.[0-9]+-java15"
       - "[0-9]+.[0-9]+.[0-9]+-java16*"
     paths-ignore:
       - "*.md"
diff --git a/README.md b/README.md
index eb94445a..a0311d67 100644
--- a/README.md
+++ b/README.md
@@ -275,13 +275,11 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
 | latest         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
-| edge           | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8-openj9   | 8            | Debian | OpenJ9   | amd64             |
 | java11         | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java11-openj9  | 11           | Debian | OpenJ9   | amd64             |
-| java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
diff --git a/docker-versions-create.sh b/docker-versions-create.sh
index 81a7bdcd..6f8b7d0c 100755
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -7,7 +7,6 @@ branches_list=(
   'java8-openj9'
   'java11'
   'java11-openj9'
-  'java15'
   'java16'
   'java16-openj9'
   'multiarch-latest'