Fix #175: convert to direct use of module-info.java

FasterXML · Jan 19, 2025 · 40bce75 · 40bce75
1 parent 6b4498c
commit 40bce75
Show file tree

Hide file tree

Showing 15 changed files with 109 additions and 37 deletions.
diff --git a/eclipse-collections/pom.xml b/eclipse-collections/pom.xml
@@ -29,14 +29,11 @@
   </contributors>
 
   <properties>
-    <version.eclipse-collections>11.0.0</version.eclipse-collections>
+    <version.eclipse-collections>11.1.0</version.eclipse-collections>
 
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>tools/jackson/datatype/eclipsecollections</packageVersion.dir>
     <packageVersion.package>${project.groupId}.eclipsecollections</packageVersion.package>
-
-    <javac.src.version>1.8</javac.src.version>
-    <javac.target.version>1.8</javac.target.version>
   </properties>
 
   <dependencies>
@@ -58,10 +55,6 @@
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>io.timeandspace</groupId>
         <artifactId>jpsg-maven-plugin</artifactId>

diff --git a/...collections/src/moditect/module-info.java → ...ollections/src/main/java/module-info.java b/...collections/src/moditect/module-info.java → ...ollections/src/main/java/module-info.java
@@ -1,9 +1,11 @@
-// Generated 20-Mar-2019 using Moditect maven plugin
-module tools.jackson.datatype.eclipse.collections {
+// Eclipse-collections module Main artifact Module descriptor
+module tools.jackson.datatype.eclipsecollections
+{
     requires com.fasterxml.jackson.annotation;
     requires tools.jackson.core;
-    requires tools.jackson.databind;
-    requires jackson.datatype.primitive.collections.base;
+    requires transitive tools.jackson.databind;
+
+    requires tools.jackson.datatype.primitive_collections_base;
 
     requires org.eclipse.collections.api;
     requires org.eclipse.collections.impl;

diff --git a/eclipse-collections/src/test/java/module-info.java b/eclipse-collections/src/test/java/module-info.java
@@ -0,0 +1,22 @@
+//  Eclipse-collections module (unit) Test Module descriptor
+module tools.jackson.datatype.eclipsecollections
+{
+    // 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 transitive tools.jackson.databind;
+
+    requires tools.jackson.datatype.primitive_collections_basee;
+
+    requires org.eclipse.collections.api;
+    requires org.eclipse.collections.impl;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+
+    opens tools.jackson.datatype.eclipsecollections;
+}
diff --git a/guava/pom.xml b/guava/pom.xml
@@ -60,10 +60,6 @@ com.google.common.*;version="${version.guava.osgi}",
         <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/guava/src/moditect/module-info.java → guava/src/main/java/module-info.java b/guava/src/moditect/module-info.java → guava/src/main/java/module-info.java
@@ -1,11 +1,12 @@
-module tools.jackson.datatype.guava {
+// Guava module Main artifact Module descriptor
+module tools.jackson.datatype.guava
+{
     requires com.fasterxml.jackson.annotation;
 
     requires tools.jackson.core;
     requires tools.jackson.databind;
 
-    requires static guava;
-    requires static com.google.common;
+    requires com.google.common;
 
     exports tools.jackson.datatype.guava;
     exports tools.jackson.datatype.guava.deser;

diff --git a/guava/src/test/java/module-info.java b/guava/src/test/java/module-info.java
@@ -0,0 +1,23 @@
+//  Guava module (unit) Test Module descriptor
+module tools.jackson.datatype.guava
+{
+    // 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 com.google.common;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+
+    opens tools.jackson.datatype.guava;
+    opens tools.jackson.datatype.guava.fuzz;
+    opens tools.jackson.datatype.guava.optional;
+    opens tools.jackson.datatype.guava.pojo;
+}
diff --git a/hppc/pom.xml b/hppc/pom.xml
@@ -41,10 +41,6 @@ High-Performance Primitive Collections (HPPC, see http://labs.carrotsearch.com/h
         <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/hppc/src/moditect/module-info.java → hppc/src/main/java/module-info.java b/hppc/src/moditect/module-info.java → hppc/src/main/java/module-info.java
@@ -1,7 +1,10 @@
-module tools.jackson.datatype.hppc {
+// HPPC module Main artifact Module descriptor
+module tools.jackson.datatype.hppc
+{
     requires tools.jackson.core;
-    requires tools.jackson.databind;
-    requires hppc;
+    requires transitive tools.jackson.databind;
+
+    requires com.carrotsearch.hppc;
 
     exports tools.jackson.datatype.hppc;
     exports tools.jackson.datatype.hppc.deser;

diff --git a/hppc/src/test/java/module-info.java b/hppc/src/test/java/module-info.java
@@ -0,0 +1,20 @@
+//  HPPC module (unit) Test Module descriptor
+module tools.jackson.datatype.hppc
+{
+    // 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 com.carrotsearch.hppc;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+
+    opens tools.jackson.datatype.hppc;
+    opens tools.jackson.datatype.hppc.deser;
+    opens tools.jackson.datatype.hppc.ser;
+}
diff --git a/pcollections/pom.xml b/pcollections/pom.xml
@@ -47,10 +47,6 @@ PCollections (http://pcollections.org/) 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/pcollections/src/moditect/module-info.java → pcollections/src/main/java/module-info.java b/pcollections/src/moditect/module-info.java → pcollections/src/main/java/module-info.java
@@ -1,6 +1,9 @@
-module jackson.datatype.pcollections {
+// PCollections module Main artifact Module descriptor
+module jackson.datatype.pcollections
+{
     requires tools.jackson.core;
-    requires tools.jackson.databind;
+    requires transitive tools.jackson.databind;
+
     requires org.pcollections;
 
     exports tools.jackson.datatype.pcollections;

diff --git a/pcollections/src/test/java/module-info.java b/pcollections/src/test/java/module-info.java
@@ -0,0 +1,18 @@
+//  PCollections module (unit) Test Module descriptor
+module jackson.datatype.pcollections
+{
+    // 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 org.pcollections;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.pcollections;
+    opens tools.jackson.datatype.pcollections.deser;
+}
diff --git a/primitive-collections-base/pom.xml b/primitive-collections-base/pom.xml
@@ -34,10 +34,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/...ctions-base/src/moditect/module-info.java → ...tions-base/src/main/java/module-info.java b/...ctions-base/src/moditect/module-info.java → ...tions-base/src/main/java/module-info.java
@@ -1,4 +1,6 @@
-module jackson.datatype.primitive.collections.base {
+// Collections-base module Main artifact Module descriptor
+module tools.jackson.datatype.primitive_collections_base
+{
     requires com.fasterxml.jackson.annotation;
 
     requires transitive tools.jackson.core;

diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -16,6 +16,7 @@ Modules:
 #69: Add support for Guava primitives during deserialization
  (contributed by László-Róbert A)
 #98: Rename "com.fasterxml.jackson" -> "tools.jackson"
+#175: Change 3.0 to use `module-info.java` directly [JSTEP-11]
 - (guava) Update "preferred" Guava version to 32.1.3-jre
 - (hppc) Update `hppc` dependency to 0.10.0 (JDK 11+)
 - Minimum Java baseline: Java 17