From f8fbf7045dff438ad914290d79872e1335765feb Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Mon, 1 Apr 2024 17:32:24 -0700
Subject: [PATCH] Add java 22 nightly testing (#5313)

Needed to bump groovy to 3.0.21 to pick up ASM 9.6 which can decode Java 22.

Fixes #5289
---
 .github/workflows/nightly-check-ci.yml                   | 9 ++++++++-
 .../io/deephaven/configuration/TestConfiguration.java    | 8 ++++++++
 buildSrc/src/main/groovy/Classpaths.groovy               | 2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly-check-ci.yml b/.github/workflows/nightly-check-ci.yml
index dcf766313e1..77b4ce88ca2 100644
--- a/.github/workflows/nightly-check-ci.yml
+++ b/.github/workflows/nightly-check-ci.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         gradle-task: ['check', 'testSerial', 'testParallel', 'testOutOfBand']
-        test-jvm-version: ['11', '17', '21']
+        test-jvm-version: ['11', '17', '21', '22']
     if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }}
     runs-on: ubuntu-22.04
     concurrency:
@@ -48,6 +48,13 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
 
+      - name: Setup JDK 22
+        id: setup-java-22
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '22'
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
diff --git a/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java b/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java
index 8d771d2376f..925fca10d16 100644
--- a/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java
+++ b/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java
@@ -455,6 +455,14 @@ public void testShowHistory() {
                             +
                             "java.base/java.lang.reflect.Method.invoke(Method.java:580)\n",
                     history.get(0).fileName);
+        } else if ("22".equals(javaVersion)) {
+            assertEquals(
+                    "<not from configuration file>: io.deephaven.configuration.TestConfiguration.testShowHistory(TestConfiguration.java:428)\n"
+                            +
+                            "java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)\n"
+                            +
+                            "java.base/java.lang.reflect.Method.invoke(Method.java:580)\n",
+                    history.get(0).fileName);
         } else {
             fail("Must add specific test for java version " + javaVersion);
         }
diff --git a/buildSrc/src/main/groovy/Classpaths.groovy b/buildSrc/src/main/groovy/Classpaths.groovy
index 33df627126b..65f1914c285 100644
--- a/buildSrc/src/main/groovy/Classpaths.groovy
+++ b/buildSrc/src/main/groovy/Classpaths.groovy
@@ -90,7 +90,7 @@ class Classpaths {
     static final String LOGBACK_VERSION = '1.4.14'
 
     static final String GROOVY_GROUP = 'org.codehaus.groovy'
-    static final String GROOVY_VERSION = '3.0.18'
+    static final String GROOVY_VERSION = '3.0.21'
 
     static final String GRPC_GROUP = 'io.grpc'
     static final String GRPC_NAME = 'grpc-bom'