From 802c1259781ea4f7198e0f6eba6fc2d9f78f4b0a Mon Sep 17 00:00:00 2001
From: Greg Watts <gwatts@us.ibm.com>
Date: Tue, 19 Mar 2024 12:43:14 -0500
Subject: [PATCH] Update Java 22 specific test with GA version

---
 .github/workflows/CI.yml                           | 8 ++++----
 .github/workflows/scripts/ClassVersionChecker.java | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index dc9061f..7b3c1c5 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java-version: [ '17', '18', '19', '20', '21', '22-ea' ]
+        java-version: [ '17', '18', '19', '20', '21', '22' ]
 
     runs-on: ubuntu-latest
 
@@ -36,14 +36,14 @@ jobs:
       uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         java-version: ${{ matrix.java-version }}
-        distribution: 'temurin'
+        distribution: 'oracle'
 
     # This is the JDK gradle will use since gradle does not always support the -ea version
     - name: Set up JDK 11
       uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
-        java-version: '11'
-        distribution: 'temurin'
+        java-version: '17'
+        distribution: 'oracle'
         cache: gradle    
 
     - name: Toolchain debug
diff --git a/.github/workflows/scripts/ClassVersionChecker.java b/.github/workflows/scripts/ClassVersionChecker.java
index 52ba278..5ead5ee 100755
--- a/.github/workflows/scripts/ClassVersionChecker.java
+++ b/.github/workflows/scripts/ClassVersionChecker.java
@@ -33,6 +33,7 @@ public static void main(String[] args) throws IOException {
         majorCodeMap.put("19", 63);
         majorCodeMap.put("20", 64);
         majorCodeMap.put("21", 65);
+        majorCodeMap.put("22", 66);
 
         String filename = args[0];
         int expected = majorCodeMap.get(args[1]);