From 8fbbb86717b40a3f5e3b0646269a07404341d863 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 10 Jan 2025 17:02:34 -0800
Subject: [PATCH] Try to make things work. They don't. :-(

---
 pom.xml                        | 5 ++++-
 src/test/java/module-info.java | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index df203d0f1e..14081c12de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,7 +333,10 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
+               <argLine>--add-opens=java.base/java.lang=tools.jackson.databind
+                        --add-opens=java.base/java.util=tools.jackson.databind
+                        --add-opens=java.sql/java.sql=tools.jackson.databind
+               </argLine>
             </configuration>
           </plugin>
         </plugins>
diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java
index 8d01dbd4eb..50a1e114a0 100644
--- a/src/test/java/module-info.java
+++ b/src/test/java/module-info.java
@@ -13,8 +13,12 @@
 
     // // Actual Test dependencies
 
+    // Guava testlib needed by CLMH tests, alas; brings in junit4
     requires guava.testlib;
+    // JUnit4 should NOT be needed but is transitively required
+    requires junit;
     requires org.assertj.core;
+    requires org.mockito;
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.params;
 
@@ -61,6 +65,7 @@
     opens tools.jackson.databind.ext.jdk8;
     opens tools.jackson.databind.ext.jdk9;
     opens tools.jackson.databind.ext.jdk17;
+    opens tools.jackson.databind.ext.sql;
     opens tools.jackson.databind.format;
     opens tools.jackson.databind.interop;
     opens tools.jackson.databind.jsonschema;