From fea98f2645735ae6469cec1aade5de6ea9dfe63b Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Thu, 26 Sep 2024 16:18:11 -0400
Subject: [PATCH 1/2] upgrade github actions test matrix

---
 .github/workflows/CI.yml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index aa9d9f03..ef207761 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -28,24 +28,34 @@ on:
 
 jobs:
   test:
-    name: '${{ matrix.platform }} with Java ${{ matrix.java-version}}'
+    name: '${{ matrix.platform }} with Java ${{ matrix.java-distribution }} version ${{ matrix.java-version }}'
     strategy:
       matrix:
         platform:
           - ubuntu-latest
-          - windows-latest
-          - macos-latest
+        java-distribution:
+          - adopt-hotspot
+          - temurin
+          - zulu
         java-version:
           - 8
           - 11
+        include:
+          - platform: windows-latest
+            java-distribution: adopt-hotspot
+            java-version: 11
+          - platform: macos-latest
+            java-distribution: adopt-hotspot
+            java-version: 11
     runs-on: ${{ matrix.platform }}
+    timeout-minutes: 5
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: adopt-hotspot
-          java-version: ${{ matrix.java-version }}
+          java-version: ${{ matrix.java-distribution }}
       - name: Build and Test
         run: mvn -B package

From 0c20f98b977c64a120cbc36b57651243e1e8a9c1 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Thu, 26 Sep 2024 17:15:57 -0400
Subject: [PATCH 2/2] Fixed a java version error.

---
 .github/workflows/CI.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index ef207761..89fd0d66 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: adopt-hotspot
-          java-version: ${{ matrix.java-distribution }}
+          distribution: ${{ matrix.java-distribution }}
+          java-version: ${{ matrix.java-version }}
       - name: Build and Test
         run: mvn -B package