From 5c0703a591d863853a260baec9e691fd4dc00482 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Sun, 15 Oct 2023 10:32:06 -0400
Subject: Add Java 21 build to GitHub

---
 .github/workflows/maven.yml |  8 ++++----
 pom.xml                     | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 49b2b84b..fdcf20f9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,16 +28,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
         experimental: [false]
 #        include:
-#          - java: 18-ea
+#          - java: 22-ea
 #            os: ubuntu-latest
 #            experimental: true        
-#          - java: 18-ea
+#          - java: 22-ea
 #            os: windows-latest
 #            experimental: true        
-#          - java: 18-ea
+#          - java: 22-ea
 #            os: macos-latest
 #            experimental: true        
       fail-fast: false
diff --git a/pom.xml b/pom.xml
index 46fbfe08..592367ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,20 @@ file comparators, endian transformation classes, and much more.
       <version>1.9.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <!-- Java 21 support, revisit for Mockito 5 -->
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy</artifactId>
+      <version>${commons.bytebuddy.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- Java 21 support, revisit for Mockito 5 -->
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy-agent</artifactId>
+      <version>${commons.bytebuddy.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
@@ -325,6 +339,7 @@ file comparators, endian transformation classes, and much more.
     <commons.javadoc.java.link>${commons.javadoc8.java.link}</commons.javadoc.java.link>
     <commons.moditect.version>1.0.0.Final</commons.moditect.version>
     <jmh.version>1.37</jmh.version>
+    <commons.bytebuddy.version>1.14.9</commons.bytebuddy.version>
     <japicmp.skip>false</japicmp.skip>
     <jacoco.skip>${env.JACOCO_SKIP}</jacoco.skip>
     <commons.release.isDistModule>true</commons.release.isDistModule>
@@ -387,7 +402,8 @@ file comparators, endian transformation classes, and much more.
           </classpathDependencyExcludes>
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
-          <!-- limit memory size see IO-161 -->
+          <!-- Limit memory size see IO-161 -->
+          <!-- Mockito inline may need -XX:+EnableDynamicAgentLoading -->
           <argLine>${argLine} -Xmx25M</argLine>
           <includes>
             <!-- Only include test classes, not test data -->
-- 
cgit v1.2.3