From b22e37d9dbe8f2507056fd2ce44c6f137679853c Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:04:50 -0800
Subject: [PATCH 1/8] Work on #701, try to use `module-info.java` natively

---
 pom.xml                                       | 25 +++++++---
 src/{moditect => main/java}/module-info.java  |  4 +-
 src/test/java/module-info.java                | 30 +++++++++++
 .../interop/NonWoodstoxStaxImpl482Test.java   | 50 -------------------
 4 files changed, 51 insertions(+), 58 deletions(-)
 rename src/{moditect => main/java}/module-info.java (85%)
 create mode 100644 src/test/java/module-info.java
 delete mode 100644 src/test/java/tools/jackson/dataformat/xml/interop/NonWoodstoxStaxImpl482Test.java

diff --git a/pom.xml b/pom.xml
index 75f4ed654..33854b382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,8 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <version>4.2.2</version>
       <exclusions>
         <exclusion>
-	  <groupId>javax.xml.stream</groupId>
-	  <artifactId>stax-api</artifactId>
+          <groupId>javax.xml.stream</groupId>
+	     <artifactId>stax-api</artifactId>
         </exclusion>
       </exclusions> 
     </dependency>
@@ -92,6 +92,22 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- 11-Jan-2025, joohyukkim: JSTEP-10, part 1, migrate to JUnit5 -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <!--  Jakarta XMLBind (nee javax/jaxb( annotation introspector is needed BUT ONLY
           for tests (starting 2.13: previously compile/runtime)
@@ -185,11 +201,6 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
             </includes>
           </configuration>
         </plugin>
-      <!-- 20-Mar-2019, tatu: use Moditect for JDK9+ module info inclusion -->
-      <plugin>
-	<groupId>org.moditect</groupId>
-	<artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
       <!-- 05-Jul-2020, tatu: Add gradle module metadata -->
       <plugin>
         <groupId>de.jjohannes</groupId>
diff --git a/src/moditect/module-info.java b/src/main/java/module-info.java
similarity index 85%
rename from src/moditect/module-info.java
rename to src/main/java/module-info.java
index 9e06e0da2..7e7170a31 100644
--- a/src/moditect/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,4 +1,6 @@
-module tools.jackson.dataformat.xml {
+//  Jackson 3.x module-info for jackson-dataformat-xml Main artifact
+module tools.jackson.dataformat.xml
+{
     requires java.xml;
     requires org.codehaus.stax2;
 
diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java
new file mode 100644
index 000000000..968a8acf5
--- /dev/null
+++ b/src/test/java/module-info.java
@@ -0,0 +1,30 @@
+//  Jackson 3.x module-info for jackson-dataformat-xml Test artifact
+module tools.jackson.dataformat.xml
+{
+    // First, same requires as the main artifact
+    
+    requires java.xml;
+    requires org.codehaus.stax2;
+
+    requires com.fasterxml.jackson.annotation;
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    // Then test library dependencies
+    requires junit;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
+    
+    // Then exports same as main artifact
+
+    exports tools.jackson.dataformat.xml;
+    exports tools.jackson.dataformat.xml.annotation;
+    exports tools.jackson.dataformat.xml.deser;
+    exports tools.jackson.dataformat.xml.ser;
+    exports tools.jackson.dataformat.xml.util;
+
+    provides tools.jackson.core.TokenStreamFactory with
+        tools.jackson.dataformat.xml.XmlFactory;
+    provides tools.jackson.databind.ObjectMapper with
+        tools.jackson.dataformat.xml.XmlMapper;
+}
diff --git a/src/test/java/tools/jackson/dataformat/xml/interop/NonWoodstoxStaxImpl482Test.java b/src/test/java/tools/jackson/dataformat/xml/interop/NonWoodstoxStaxImpl482Test.java
deleted file mode 100644
index cdf653502..000000000
--- a/src/test/java/tools/jackson/dataformat/xml/interop/NonWoodstoxStaxImpl482Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package tools.jackson.dataformat.xml.interop;
-
-import tools.jackson.core.JsonParser;
-import tools.jackson.databind.ObjectReader;
-import tools.jackson.dataformat.xml.XmlFactory;
-import tools.jackson.dataformat.xml.XmlMapper;
-import tools.jackson.dataformat.xml.XmlTestBase;
-
-import com.sun.xml.stream.ZephyrParserFactory;
-import com.sun.xml.stream.ZephyrWriterFactory;
-
-// to verify issue behind [dataformat-xml#482]
-public class NonWoodstoxStaxImpl482Test extends XmlTestBase
-{
-    static class Root {
-        public int value = 3;
-    }
-
-    private final XmlMapper SJSXP_MAPPER = XmlMapper.builder(
-            XmlFactory.builder()
-                .xmlInputFactory(new ZephyrParserFactory())
-                .xmlOutputFactory(new ZephyrWriterFactory())
-            .build())
-            .build();
- 
-    // [dataformat-xml#482]
-    public void testSjsxpFromByteArray() throws Exception
-    {
-        byte[] xml0 = SJSXP_MAPPER.writeValueAsBytes(new Root());
-        // and just for fun, ensure offset handling works:
-        byte[] xml = new byte[xml0.length + 10];
-        System.arraycopy(xml0, 0, xml, 5, xml0.length);
-        Root result = SJSXP_MAPPER.readValue(xml, 5, xml0.length, Root.class);
-        assertNotNull(result);
-    }
-
-    // [dataformat-xml#482]
-    public void testSjsxpFromCharArray() throws Exception
-    {
-        char[] xml0 = SJSXP_MAPPER.writeValueAsString(new Root()).toCharArray();
-        // add offset
-        char[] xml = new char[xml0.length + 10];
-        System.arraycopy(xml0, 0, xml, 5, xml0.length);
-        ObjectReader r = SJSXP_MAPPER.readerFor(Root.class);
-        JsonParser p = r.createParser(xml, 5, xml0.length);
-        Root result =  r.readValue(p);
-        p.close();
-        assertNotNull(result);
-    }
-}

From 3b840bfdb0f82b41b92abf400b05e136bc9c4361 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:12:03 -0800
Subject: [PATCH 2/8] ...

---
 pom.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33854b382..b4aaf1835 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,8 +80,8 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <version>7.1.0</version>
       <exclusions>
         <exclusion>
-	  <groupId>javax.xml.stream</groupId>
-	  <artifactId>stax-api</artifactId>
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
         </exclusion>
       </exclusions> 
     </dependency>
@@ -130,13 +130,17 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
     <!-- 03-Jul-2021, tatu: For sanity checking of non-Woodstox impl usage
         need, say, Sjsxp
       -->
+    <!-- 11-Jan-2025, tatu: Can't properly due to missing JPMS, may re-evalute
+         in future but for now excluded
+      -->
+    <!--
     <dependency>
       <groupId>com.sun.xml.stream</groupId>
       <artifactId>sjsxp</artifactId>
       <version>1.0.2</version>
       <scope>test</scope>
     </dependency>
-
+    -->
   </dependencies>
 
   <!-- Alas, need to include snapshot reference since otherwise can not find

From 8ed5a639839766c6ca8eefd1cc56c8e0925c67dd Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:26:36 -0800
Subject: [PATCH 3/8] More work

---
 pom.xml                                               |  2 ++
 src/test/java/module-info.java                        | 10 +++++++---
 .../xml/failing/XmlTextViaCreator306Test.java         | 11 +++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index b4aaf1835..95f333c7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <scope>test</scope>
     </dependency>
     <!-- 11-Jan-2025, joohyukkim: JSTEP-10, part 1, migrate to JUnit5 -->
+    <!--
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
@@ -108,6 +109,7 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    -->
 
     <!--  Jakarta XMLBind (nee javax/jaxb( annotation introspector is needed BUT ONLY
           for tests (starting 2.13: previously compile/runtime)
diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java
index 968a8acf5..2b6ff5e8d 100644
--- a/src/test/java/module-info.java
+++ b/src/test/java/module-info.java
@@ -10,10 +10,14 @@
     requires tools.jackson.core;
     requires tools.jackson.databind;
 
-    // Then test library dependencies
+    // Then test dependencies
     requires junit;
-    requires org.junit.jupiter.api;
-    requires org.junit.jupiter.params;
+    //requires org.junit.jupiter.api;
+    //requires org.junit.jupiter.params;
+
+    requires com.ctc.wstx; // woodstox
+    requires jakarta.xml.bind; // Jakarta-binding
+    requires tools.jackson.module.jakarta.xmlbind;
     
     // Then exports same as main artifact
 
diff --git a/src/test/java/tools/jackson/dataformat/xml/failing/XmlTextViaCreator306Test.java b/src/test/java/tools/jackson/dataformat/xml/failing/XmlTextViaCreator306Test.java
index cf21d645f..9e55e53aa 100644
--- a/src/test/java/tools/jackson/dataformat/xml/failing/XmlTextViaCreator306Test.java
+++ b/src/test/java/tools/jackson/dataformat/xml/failing/XmlTextViaCreator306Test.java
@@ -1,8 +1,7 @@
 package tools.jackson.dataformat.xml.failing;
 
-import java.beans.ConstructorProperties;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
 import tools.jackson.dataformat.xml.XmlMapper;
@@ -37,8 +36,8 @@ static class Child {
         @JacksonXmlText
         String el;
 
-        @ConstructorProperties({"attr", "el"})
-        Child(String attr, String el) {
+        @JsonCreator
+        Child(@JsonProperty("attr") String attr, @JsonProperty("el") String el) {
             this.attr = attr;
             this.el = el;
         }
@@ -49,8 +48,8 @@ static class RootWithoutConstructor {
         @JacksonXmlProperty(localName = "CHILD")
         final ChildWithoutConstructor child;
 
-        @ConstructorProperties({"child"})
-        public RootWithoutConstructor(ChildWithoutConstructor child) {
+        @JsonCreator
+        public RootWithoutConstructor(@JsonProperty("child") ChildWithoutConstructor child) {
             this.child = child;
         }
 

From d35e96c48ee63e8cfbc7010f38880cf7df99945f Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:32:24 -0800
Subject: [PATCH 4/8] Incremental progress

---
 src/test/java/module-info.java                | 25 +++++++++++--------
 .../{ser => }/dos/CyclicXMLDataSerTest.java   |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)
 rename src/test/java/tools/jackson/dataformat/xml/{ser => }/dos/CyclicXMLDataSerTest.java (96%)

diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java
index 2b6ff5e8d..69b2ea2c8 100644
--- a/src/test/java/module-info.java
+++ b/src/test/java/module-info.java
@@ -19,16 +19,21 @@
     requires jakarta.xml.bind; // Jakarta-binding
     requires tools.jackson.module.jakarta.xmlbind;
     
-    // Then exports same as main artifact
+    // Then same exports as main artifact, but as "opens"
 
-    exports tools.jackson.dataformat.xml;
-    exports tools.jackson.dataformat.xml.annotation;
-    exports tools.jackson.dataformat.xml.deser;
-    exports tools.jackson.dataformat.xml.ser;
-    exports tools.jackson.dataformat.xml.util;
+    opens tools.jackson.dataformat.xml;
+    opens tools.jackson.dataformat.xml.annotation;
+    opens tools.jackson.dataformat.xml.deser;
+    opens tools.jackson.dataformat.xml.ser;
+    opens tools.jackson.dataformat.xml.util;
 
-    provides tools.jackson.core.TokenStreamFactory with
-        tools.jackson.dataformat.xml.XmlFactory;
-    provides tools.jackson.databind.ObjectMapper with
-        tools.jackson.dataformat.xml.XmlMapper;
+    // And then additional "opens" access for tests not in packages of main
+
+    opens tools.jackson.dataformat.xml.adapters;
+    opens tools.jackson.dataformat.xml.dos;
+    opens tools.jackson.dataformat.xml.fuzz;
+    opens tools.jackson.dataformat.xml.jaxb;
+    opens tools.jackson.dataformat.xml.lists;
+    opens tools.jackson.dataformat.xml.node;
+    opens tools.jackson.dataformat.xml.vld;
 }
diff --git a/src/test/java/tools/jackson/dataformat/xml/ser/dos/CyclicXMLDataSerTest.java b/src/test/java/tools/jackson/dataformat/xml/dos/CyclicXMLDataSerTest.java
similarity index 96%
rename from src/test/java/tools/jackson/dataformat/xml/ser/dos/CyclicXMLDataSerTest.java
rename to src/test/java/tools/jackson/dataformat/xml/dos/CyclicXMLDataSerTest.java
index 48a0a038b..78d89de71 100644
--- a/src/test/java/tools/jackson/dataformat/xml/ser/dos/CyclicXMLDataSerTest.java
+++ b/src/test/java/tools/jackson/dataformat/xml/dos/CyclicXMLDataSerTest.java
@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.xml.ser.dos;
+package tools.jackson.dataformat.xml.dos;
 
 import java.util.ArrayList;
 import java.util.List;

From 10eb673725abe22255209a8c288b437357ffb494 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:35:50 -0800
Subject: [PATCH 5/8] Complete work

---
 src/test/java/module-info.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java
index 69b2ea2c8..36f1fb70f 100644
--- a/src/test/java/module-info.java
+++ b/src/test/java/module-info.java
@@ -30,10 +30,20 @@
     // And then additional "opens" access for tests not in packages of main
 
     opens tools.jackson.dataformat.xml.adapters;
+    opens tools.jackson.dataformat.xml.deser.builder;
+    opens tools.jackson.dataformat.xml.deser.convert;
+    opens tools.jackson.dataformat.xml.deser.creator;
     opens tools.jackson.dataformat.xml.dos;
+    opens tools.jackson.dataformat.xml.failing;
+    opens tools.jackson.dataformat.xml.failing.records;
     opens tools.jackson.dataformat.xml.fuzz;
     opens tools.jackson.dataformat.xml.jaxb;
+    opens tools.jackson.dataformat.xml.incr;
+    opens tools.jackson.dataformat.xml.jdk17;
     opens tools.jackson.dataformat.xml.lists;
+    opens tools.jackson.dataformat.xml.misc;
     opens tools.jackson.dataformat.xml.node;
+    opens tools.jackson.dataformat.xml.stream;
     opens tools.jackson.dataformat.xml.vld;
+    opens tools.jackson.dataformat.xml.woodstox;
 }

From 10e7c01d3b8751e1b095b3cd934e4f912ffd08ef Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:37:40 -0800
Subject: [PATCH 6/8] Update release notes

---
 release-notes/VERSION | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release-notes/VERSION b/release-notes/VERSION
index 59a31552a..24c3d6d30 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -12,5 +12,6 @@ Version: 3.x (for earlier see VERSION-2.x)
 #540: Rename "com.fasterxml.jackson" -> "tools.jackson"
 #687: JSTEP-8: rename `FromXmlParser.Feature` as `XmlReadFeature`,
   `ToXmlGenerator.Feature` as `XmlWriteFeature`
+#701: Change 3.0 to use `module-info.java` directly, remove use of Moditect
 - Add `XmlMapper.shared()`
 - Minimum Java baseline: Java 17

From 2a63d2f2378cff1b41cf9b5c308def5f2049c908 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:38:32 -0800
Subject: [PATCH 7/8] ...

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 95f333c7f..d3cd97198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
       <exclusions>
         <exclusion>
           <groupId>javax.xml.stream</groupId>
-	     <artifactId>stax-api</artifactId>
+          <artifactId>stax-api</artifactId>
         </exclusion>
       </exclusions> 
     </dependency>

From a8e79fdf0e0acaba67b7660349c4073b832568e7 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 16:40:25 -0800
Subject: [PATCH 8/8] Update ci

---
 .github/workflows/main.yml            | 2 +-
 .mvn/wrapper/maven-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b432de56a..259b5d5c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '21' ]
+        java_version: ['17', '21', '23' ]
         include:
           - java_version: '17'
             release_build: 'R'
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 8f2e64519..b9b1153ae 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar