Fix #531: use module-info.java directly

csv/pom.xml

@@ -64,13 +64,6 @@ abstractions.
           </execution>
         </executions>
       </plugin>
-      <!--  19-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
-             will have to use `moduleInfoFile` as anything else requires JDK 9+
-        -->
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 

csv/src/moditect/module-info.java → csv/src/main/java/module-info.java

@@ -1,10 +1,11 @@
-// Generated 27-Mar-2019 using Moditect maven plugin
-module tools.jackson.dataformat.csv {
+// CSV Main artifact Module descriptor
+module tools.jackson.dataformat.csv
+{
     requires tools.jackson.core;
     requires tools.jackson.databind;
 
     exports tools.jackson.dataformat.csv;
-//    exports tools.jackson.dataformat.csv.impl;
+    // exports tools.jackson.dataformat.csv.impl;
 
     provides tools.jackson.core.TokenStreamFactory with
         tools.jackson.dataformat.csv.CsvFactory;

csv/src/test/java/module-info.java

@@ -0,0 +1,26 @@
+// CSV unit test Module descriptor
+module tools.jackson.dataformat.csv
+{
+    // 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;
+
+    // Additional test lib/framework dependencies
+    requires org.assertj.core;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
+
+    // Further, need to open up some packages for JUnit et al
+    opens tools.jackson.dataformat.csv;
+    opens tools.jackson.dataformat.csv.deser;
+    opens tools.jackson.dataformat.csv.filter;
+    opens tools.jackson.dataformat.csv.fuzz;
+    opens tools.jackson.dataformat.csv.schema;
+    opens tools.jackson.dataformat.csv.ser;
+    opens tools.jackson.dataformat.csv.ser.dos;
+    opens tools.jackson.dataformat.csv.testutil;
+    opens tools.jackson.dataformat.csv.testutil.failure;
+    opens tools.jackson.dataformat.csv.tofix;
+}

properties/pom.xml

@@ -54,13 +54,6 @@ configuration files as if there was implied nesting structure (by default using
           </execution>
         </executions>
       </plugin>
-      <!--  19-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
-             will have to use `moduleInfoFile` as anything else requires JDK 9+
-        -->
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>

properties/src/moditect/module-info.java → properties/src/main/java/module-info.java

@@ -1,10 +1,11 @@
-// Generated 27-Mar-2019 using Moditect maven plugin
-module tools.jackson.dataformat.javaprop {
+// Properties Main artifact Module descriptor
+module tools.jackson.dataformat.javaprop
+{
     requires tools.jackson.core;
     requires tools.jackson.databind;
 
     exports tools.jackson.dataformat.javaprop;
-//    exports tools.jackson.dataformat.javaprop.impl;
+    // exports tools.jackson.dataformat.javaprop.impl;
     exports tools.jackson.dataformat.javaprop.io;
     exports tools.jackson.dataformat.javaprop.util;
 

properties/src/test/java/module-info.java

@@ -0,0 +1,25 @@
+// Properties unit test Module descriptor
+module tools.jackson.dataformat.javaprop
+{
+    // 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;
+
+    // Additional test lib/framework dependencies
+    requires org.assertj.core;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
+
+    // Further, need to open up some packages for JUnit et al
+    opens tools.jackson.dataformat.javaprop;
+    opens tools.jackson.dataformat.javaprop.constraints;
+    opens tools.jackson.dataformat.javaprop.deser;
+    opens tools.jackson.dataformat.javaprop.deser.convert;
+    opens tools.jackson.dataformat.javaprop.filter;
+    opens tools.jackson.dataformat.javaprop.ser.dos;
+    opens tools.jackson.dataformat.javaprop.testutil;
+    opens tools.jackson.dataformat.javaprop.testutil.failure;
+    opens tools.jackson.dataformat.javaprop.util;
+}

release-notes/VERSION

@@ -26,6 +26,7 @@ implementations)
   `CsvGenerator.Feature` as `CsvWriteFeature`
 #512: (yaml) JSTEP-8: rename `YAMLParser.Feature` as `YAMLReadFeature`,
   `YAMLGenerator.Feature` as `YAMLWriteFeature`
+#531: Change 3.0 to use `module-info.java` directly [JSTEP-11]
 - (csv) Remove `CsvMappingException` (replaced by `CsvRead-/-WriteException`)
 - Add `XxxMapper.shared()` methods for getting globally shared default instances
 - Minimum Java baseline: Java 17

toml/pom.xml

@@ -58,10 +58,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>de.jflex</groupId>
                 <artifactId>jflex-maven-plugin</artifactId>

toml/src/moditect/module-info.java → toml/src/main/java/module-info.java

@@ -1,4 +1,6 @@
-module tools.jackson.dataformat.toml {
+// TOML Main artifact Module descriptor
+module tools.jackson.dataformat.toml
+{
     requires tools.jackson.core;
     requires tools.jackson.databind;
 

toml/src/test/java/module-info.java

@@ -0,0 +1,19 @@
+// Properties unit test Module descriptor
+module tools.jackson.dataformat.toml
+{
+    // 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;
+
+    // Additional test lib/framework dependencies
+    requires org.assertj.core;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
+
+    // Further, need to open up some packages for JUnit et al
+    opens tools.jackson.dataformat.toml;
+    opens tools.jackson.dataformat.toml.dos;
+    opens tools.jackson.dataformat.toml.testutil.failure;
+}

yaml/pom.xml

@@ -60,13 +60,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--  19-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
-             will have to use `moduleInfoFile` as anything else requires JDK 9+
-        -->
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>

yaml/src/moditect/module-info.java → yaml/src/main/java/module-info.java

@@ -1,9 +1,11 @@
-module tools.jackson.dataformat.yaml {
+// YAML Main artifact Module descriptor
+module tools.jackson.dataformat.yaml
+{
     requires tools.jackson.core;
     requires tools.jackson.databind;
 
-    // Not sure what canonical module name is for SnakeYAML?
-    requires org.yaml.snakeyaml;
+    // Jackson 3.0 uses snakeyaml-engine (2.x snakeyaml)
+    requires org.snakeyaml.engine.v2;
 
     exports tools.jackson.dataformat.yaml;
     exports tools.jackson.dataformat.yaml.util;

yaml/src/test/java/module-info.java

@@ -0,0 +1,30 @@
+// Properties unit test Module descriptor
+module tools.jackson.dataformat.yaml
+{
+    // 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.snakeyaml.engine.v2;
+
+    // Additional test lib/framework dependencies
+    requires org.assertj.core;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
+
+    // Further, need to open up some packages for JUnit et al
+    opens tools.jackson.dataformat.yaml;
+    opens tools.jackson.dataformat.yaml.constraints;
+    opens tools.jackson.dataformat.yaml.deser;
+    opens tools.jackson.dataformat.yaml.filter;
+    opens tools.jackson.dataformat.yaml.fuzz;
+    opens tools.jackson.dataformat.yaml.misc;
+    opens tools.jackson.dataformat.yaml.ser;
+    opens tools.jackson.dataformat.yaml.ser.dos;
+    opens tools.jackson.dataformat.yaml.testutil;
+    opens tools.jackson.dataformat.yaml.testutil.failure;
+    opens tools.jackson.dataformat.yaml.tofix;
+    opens tools.jackson.dataformat.yaml.type;
+}