Add Ion module info too

Author: cowtowncoder

ion/pom.xml

@@ -78,13 +78,6 @@ tree model)
           </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>

ion/src/moditect/module-info.java renamed to ion/src/main/java/module-info.java

@@ -1,17 +1,17 @@
-// Generated 15-Mar-2019 using Moditect maven plugin
-module tools.jackson.dataformat.ion {
-    requires transitive com.fasterxml.jackson.annotation;
+// Ion Main artifact Module descriptor
+module tools.jackson.dataformat.ion
+{
     requires tools.jackson.core;
     requires tools.jackson.databind;
-
-    requires static ion.java;
-
     requires java.sql;
 
+    // ion-java has no explicit module-info; but automatic name is:
+    requires com.amazon.ion;
+
     exports tools.jackson.dataformat.ion;
     exports tools.jackson.dataformat.ion.ionvalue;
+    exports tools.jackson.dataformat.ion.jsr310;
     exports tools.jackson.dataformat.ion.polymorphism;
-    exports tools.jackson.dataformat.ion.util;
 
     provides tools.jackson.core.TokenStreamFactory with
         tools.jackson.dataformat.ion.IonFactory;

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

@@ -0,0 +1,28 @@
+// Ion unit test Module descriptor
+module tools.jackson.dataformat.ion
+{
+    // 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.sql;
+
+    requires com.amazon.ion;
+    
+    // Additional test lib/framework dependencies
+    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.ion;
+    opens tools.jackson.dataformat.ion.dos;
+    opens tools.jackson.dataformat.ion.fuzz;
+    opens tools.jackson.dataformat.ion.ionvalue;
+    opens tools.jackson.dataformat.ion.jsr310;
+    opens tools.jackson.dataformat.ion.misc;
+    opens tools.jackson.dataformat.ion.polymorphism;
+    opens tools.jackson.dataformat.ion.sequence;
+    opens tools.jackson.dataformat.ion.testutil.failure;
+    opens tools.jackson.dataformat.ion.tofix;
+}