From 3f69d5f6efff31ab5a53102a9c6c4ca1da0ae94f Mon Sep 17 00:00:00 2001
From: David Cromberge <dcromberge@apache.org>
Date: Wed, 4 May 2022 15:25:54 +0100
Subject: [PATCH] Remove unsupported Java versions from GH Actions

---
 .github/workflows/.toolchains.xml | 20 --------------------
 .github/workflows/maven.yml       | 18 +-----------------
 tools/toolchains.xml              | 10 ----------
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml
index 7df79b88..70b6e51a 100644
--- a/.github/workflows/.toolchains.xml
+++ b/.github/workflows/.toolchains.xml
@@ -20,26 +20,6 @@
             <jdkHome>${env.JAVA8_HOME}</jdkHome>
         </configuration>
     </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>9</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA9_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>10</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA10_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
     <toolchain>
         <type>jdk</type>
         <provides>
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e0bf4e54..eacc983d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [8,9,10,11,12,13]
+        jdk: [8,11,12,13]
 
     # All JDKs are installed per build machine which is inefficient
 
@@ -46,22 +46,6 @@ jobs:
           impl: hotspot
           targets: 'JAVA8_HOME'
 
-      - name: Install JDK 9
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: '9'
-          architecture: x64
-          impl: hotspot
-          targets: 'JAVA9_HOME'
-
-      - name: Install JDK 10
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: '10'
-          architecture: x64
-          impl: hotspot
-          targets: 'JAVA10_HOME'
-
       - name: Install JDK 11
         uses: AdoptOpenJDK/install-jdk@v1
         with:
diff --git a/tools/toolchains.xml b/tools/toolchains.xml
index 06863de2..9ab86f2b 100644
--- a/tools/toolchains.xml
+++ b/tools/toolchains.xml
@@ -40,16 +40,6 @@ under the License.
             <jdkHome>${env.JAVA8_HOME}</jdkHome>
         </configuration>
     </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>9</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA9_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
     <toolchain>
         <type>jdk</type>
         <provides>