From 9b9295238dceeaa4da717a82975187042b05194d Mon Sep 17 00:00:00 2001
From: Dain Sundstrom <dain@iq80.com>
Date: Tue, 19 Mar 2024 22:52:13 -0700
Subject: [PATCH] Upgrade to latest GitHub actions

---
 .github/workflows/main.yml | 32 ++++++++++++++++----------------
 pom.xml                    | 17 -----------------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7e236e90..c2056184 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,25 +1,25 @@
-name: CI
+name: ci
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        java: ['8', '11', '17']
+        java-version:
+          - 8
+          - 21
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup test JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v1
+      - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
-          java-version: ${{ matrix.java }}
-      - run: echo "test_java_home=$JAVA_HOME" >> $GITHUB_ENV
-      - name: Setup build JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - name: Maven Test
-        run: mvn install -V -P ci -B -Dtest_java_home=${{ env.test_java_home }}
+          distribution: 'temurin'
+          java-version: ${{ matrix.java-version }}
+      - name: Maven Install
+        run: mvn install -B -V -DskipTests -Dair.check.skip-all
+      - name: Maven Tests
+        run: mvn install -B -P ci
diff --git a/pom.xml b/pom.xml
index 2a7322c7..ed2096cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,21 +158,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-    <profiles>
-        <profile>
-            <id>ci</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <jvm>${test_java_home}/bin/java</jvm>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>