Fix #887: use module-info.java natively

Author: cowtowncoder

pom.xml

@@ -90,6 +90,12 @@
             <artifactId>jackson-annotations</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>26.0.1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
@@ -207,12 +213,6 @@
                 </configuration>
             </plugin>
 
-            <!-- 02-Nov-2020, tatu: Add JDK9+ module info with Moditect -->
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-            </plugin>
-
             <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
             <plugin>
                 <groupId>de.jjohannes</groupId>

release-notes/VERSION

@@ -24,4 +24,5 @@ Former maintainers:
 
 3.0.0 (not yet released)
 
+#887: Change 3.0 to use `module-info.java` directly [JSTEP-11]
 - Minimum Java baseline: Java 17

src/main/java/module-info.java

@@ -0,0 +1,17 @@
+// Kotlin module-info for Main artifact
+module com.fasterxml.jackson.kotlin
+{
+    requires java.desktop;
+
+    requires kotlin.reflect;
+    requires kotlin.stdlib;
+
+    requires com.fasterxml.jackson.annotation;
+    requires tools.jackson.databind;
+
+    exports tools.jackson.module.kotlin;
+
+    // No 0-arg constructor, cannot register as a Service via SPI
+    //provides tools.jackson.databind.JacksonModule with
+    //    tools.jackson.module.kotlin.KotlinModule;
+}

src/moditect/module-info.java

@@ -0,0 +1,38 @@
+// Kotline module-info for (unit) Tests
+module com.fasterxml.jackson.kotlin
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires java.desktop;
+
+    requires kotlin.reflect;
+    requires kotlin.stdlib;
+    requires org.jetbrains.annotations;
+
+    requires com.fasterxml.jackson.annotation;
+    requires tools.jackson.databind;
+
+    // Additional test lib/framework dependencies
+    requires junit; // JUnit 4
+
+    // Other test deps
+
+    // Further, need to open up test packages for JUnit et al
+
+    opens tools.jackson.module.kotlin;
+    opens tools.jackson.module.kotlin.kogeraIntegration;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation.specifiedForProperty;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.jsonCreator;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nonNullObject;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nullableObject;
+    opens tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.primitive;
+    opens tools.jackson.module.kotlin.test;
+    opens tools.jackson.module.kotlin.test.github;
+    opens tools.jackson.module.kotlin.test.github.failing;
+    opens tools.jackson.module.kotlin.test.github.parameterSize;
+}