diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e06d6fe9..4b48bcb8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
   zulu:
     strategy:
       matrix:
-        java: [ '7', '8', '9', '11', '12', '13', '14', '15', '16', '17', '18' ]
+        java: [ '7', '8', '9', '11', '12', '13', '14', '15', '16', '17', '18', '21' ]
     runs-on: 'ubuntu-latest'
     env:
       JDK_MAJOR_VERSION: ${{ matrix.java }}
diff --git a/pom.xml b/pom.xml
index f87aa6dec..e5fadd71f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -656,7 +656,7 @@
             </activation>
             <properties>
                 <gmavenplus.version>1.13.1</gmavenplus.version>
-                <groovy.version>3.0.10</groovy.version>
+                <groovy.version>3.0.19</groovy.version>
                 <easymock.version>4.2</easymock.version>
                 <powermock.version>2.0.7</powermock.version>
                 <maven.japicmp.version>0.15.6</maven.japicmp.version>
@@ -683,6 +683,16 @@
                 <surefire.argLine>${test.addOpens}</surefire.argLine>
             </properties>
         </profile>
+        <profile>
+            <id>jdk21AndLater</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+            <properties>
+                <!-- normally this is 1.7, but as of 21, JDK 8 is the lowest source/target -->
+                <jdk.version>8</jdk.version>
+            </properties>
+        </profile>
         <profile>
             <id>docs</id>
             <build>