Fix #52: change to use module-info.java directly (#53)

cowtowncoder · web-flow · commit 2eb02dbae15a · 2025-01-18T20:28:33.000-08:00
diff --git a/jakarta-jsonp/pom.xml b/jakarta-jsonp/pom.xml
@@ -49,10 +49,6 @@ working with JSON-P (JSON Processing) node types (new Jakarta flavor) via data-b
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/jakarta-jsonp/src/main/java/module-info.java b/jakarta-jsonp/src/main/java/module-info.java
@@ -1,7 +1,8 @@
-// Copied+modified from jsr-353 ones on 04-Mar-2021
-module tools.jackson.datatype.jsonp {
+// Jakarta JSONP module Main artifact Module descriptor
+module tools.jackson.datatype.jsonp
+{
     requires tools.jackson.core;
-    requires tools.jackson.databind;
+    requires transitive tools.jackson.databind;
 
     requires jakarta.json;
 
diff --git a/jakarta-jsonp/src/test/java/module-info.java b/jakarta-jsonp/src/test/java/module-info.java
@@ -0,0 +1,20 @@
+// Jakarta JSONP module (unit) Test Module descriptor
+module tools.jackson.datatype.jsonp
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    requires jakarta.json;
+
+    // // Actual Test dependencies
+    requires java.desktop; // @ConstructorProperties    
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.jsonp;
+}
diff --git a/jakarta-mail/pom.xml b/jakarta-mail/pom.xml
@@ -38,10 +38,6 @@ working with Jakarta Mail types
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jakarta-mail/src/main/java/module-info.java b/jakarta-mail/src/main/java/module-info.java
@@ -1,7 +1,8 @@
-// Copied+modified from jakarta-jsonp one on 20-Aug-2021
-module tools.jackson.datatype.jakarta.mail {
+// Jakarta Mail module Main artifact Module descriptor
+module tools.jackson.datatype.jakarta_mail
+{
     requires tools.jackson.core;
-    requires tools.jackson.databind;
+    requires transitive tools.jackson.databind;
 
     requires jakarta.mail;
 
diff --git a/jakarta-mail/src/test/java/module-info.java b/jakarta-mail/src/test/java/module-info.java
@@ -0,0 +1,17 @@
+// Jakarta Mail module (unit) Test Module descriptor
+module tools.jackson.datatype.jakarta_mail
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    requires jakarta.mail;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.jakarta.mail;
+}
diff --git a/joda-money/pom.xml b/joda-money/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.joda</groupId>
       <artifactId>joda-money</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.5</version>
     </dependency>
     <dependency>
       <groupId>pl.pragmatists</groupId>
@@ -44,10 +44,6 @@
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/joda-money/src/main/java/module-info.java b/joda-money/src/main/java/module-info.java
@@ -1,8 +1,11 @@
-module tools.jackson.datatype.joda {
+// Joda-Money module Main artifact Module descriptor
+module tools.jackson.datatype.joda
+{
     requires com.fasterxml.jackson.annotation;
     requires tools.jackson.core;
-    requires tools.jackson.databind;
-    requires joda.money;
+    requires transitive tools.jackson.databind;
+
+    requires org.joda.money;
 
     exports tools.jackson.datatype.jodamoney;
 
diff --git a/joda-money/src/test/java/module-info.java b/joda-money/src/test/java/module-info.java
@@ -0,0 +1,18 @@
+// Joda-Money module (unit) Test Module descriptor
+module tools.jackson.datatype.joda
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires com.fasterxml.jackson.annotation;
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    requires org.joda.money;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.jodamoney;
+}
diff --git a/json-org/pom.xml b/json-org/pom.xml
@@ -29,7 +29,7 @@ mainly to make it easier to upgrade code to Jackson, using automated conversions
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20231013</version>
+      <version>20250107</version>
     </dependency>
   </dependencies>
   
@@ -39,10 +39,6 @@ mainly to make it easier to upgrade code to Jackson, using automated conversions
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/json-org/src/main/java/module-info.java b/json-org/src/main/java/module-info.java
@@ -1,11 +1,10 @@
-module tools.jackson.datatype.jsonorg {
+// Org.json module Main artifact Module descriptor
+module tools.jackson.datatype.jsonorg
+{
     requires tools.jackson.core;
-    requires tools.jackson.databind;
+    requires transitive tools.jackson.databind;
 
-    // is this the package name
-    requires static json;
-    //^2015
-    requires static org.json;
+    requires org.json;
 
     exports tools.jackson.datatype.jsonorg;
 
diff --git a/json-org/src/test/java/module-info.java b/json-org/src/test/java/module-info.java
@@ -0,0 +1,17 @@
+// Org.json module (unit) Test Module descriptor
+module tools.jackson.datatype.jsonorg
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    requires static org.json;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.jsonorg;
+}
diff --git a/jsr-353/pom.xml b/jsr-353/pom.xml
@@ -35,12 +35,19 @@ working with JSR-353 (JSON-P) node types via data-binding
     </dependency>
 
     <!-- and for tests can use the RI -->
+    <!-- 18-Jan-2025, tatu: Except, not with JPMS because that PoS component
+       decided to use Automatic Module Name of "java.json". Which it absolutely
+       cannot, being the _API_ module.
+       So. We cannot really run tests any more. And with deprecation by Jakarta JSONP
+       we may want to remove the module. But for now drop dep
     <dependency>
         <groupId>org.glassfish</groupId>
         <artifactId>javax.json</artifactId>
         <version>1.1.4</version>
         <scope>test</scope>
     </dependency>
+      -->
+
   </dependencies>
 
   <build>
@@ -49,9 +56,15 @@ working with JSR-353 (JSON-P) node types via data-binding
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
+      <!-- 18-Jan-2025, tatu: As per above, we cannot really run tests with JPMS.
+              So. Disable surefire plug-in altogether
+        -->
       <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/jsr-353/src/main/java/module-info.java b/jsr-353/src/main/java/module-info.java
@@ -1,6 +1,8 @@
-module tools.jackson.datatype.jsr353 {
+// JSR-353 module Main artifact Module descriptor
+module tools.jackson.datatype.jsr353
+{
     requires tools.jackson.core;
-    requires tools.jackson.databind;
+    requires transitive tools.jackson.databind;
 
     // 08-Jan-2020, tatu: changed in 2.12.1 from "javax.json.api"
     requires java.json;
diff --git a/jsr-353/src/test/java/module-info.java b/jsr-353/src/test/java/module-info.java
@@ -0,0 +1,20 @@
+// JSR-353 module (unit) Test Module descriptor
+module tools.jackson.datatype.jsr353
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    requires java.json;
+
+    // Additional test dependencies
+    requires java.desktop; // @ConstructorProperties
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.jsr353;
+}
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -13,4 +13,5 @@ Modules:
 
 3.0.0 (not yet released)
 
+#52: Change 3.0 to use `module-info.java` directly [JSTEP-11]
 - Minimum Java baseline: Java 17
