Skip to content

Commit b22e37d

Browse files
committed
Work on #701, try to use module-info.java natively
1 parent 3eca136 commit b22e37d

File tree

4 files changed

+51
-58
lines changed

4 files changed

+51
-58
lines changed

pom.xml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
6565
<version>4.2.2</version>
6666
<exclusions>
6767
<exclusion>
68-
<groupId>javax.xml.stream</groupId>
69-
<artifactId>stax-api</artifactId>
68+
<groupId>javax.xml.stream</groupId>
69+
<artifactId>stax-api</artifactId>
7070
</exclusion>
7171
</exclusions>
7272
</dependency>
@@ -92,6 +92,22 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
9292
<artifactId>junit</artifactId>
9393
<scope>test</scope>
9494
</dependency>
95+
<!-- 11-Jan-2025, joohyukkim: JSTEP-10, part 1, migrate to JUnit5 -->
96+
<dependency>
97+
<groupId>org.junit.jupiter</groupId>
98+
<artifactId>junit-jupiter</artifactId>
99+
<scope>test</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.junit.jupiter</groupId>
103+
<artifactId>junit-jupiter-api</artifactId>
104+
<scope>test</scope>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.assertj</groupId>
108+
<artifactId>assertj-core</artifactId>
109+
<scope>test</scope>
110+
</dependency>
95111

96112
<!-- Jakarta XMLBind (nee javax/jaxb( annotation introspector is needed BUT ONLY
97113
for tests (starting 2.13: previously compile/runtime)
@@ -185,11 +201,6 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
185201
</includes>
186202
</configuration>
187203
</plugin>
188-
<!-- 20-Mar-2019, tatu: use Moditect for JDK9+ module info inclusion -->
189-
<plugin>
190-
<groupId>org.moditect</groupId>
191-
<artifactId>moditect-maven-plugin</artifactId>
192-
</plugin>
193204
<!-- 05-Jul-2020, tatu: Add gradle module metadata -->
194205
<plugin>
195206
<groupId>de.jjohannes</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
module tools.jackson.dataformat.xml {
1+
// Jackson 3.x module-info for jackson-dataformat-xml Main artifact
2+
module tools.jackson.dataformat.xml
3+
{
24
requires java.xml;
35
requires org.codehaus.stax2;
46

src/test/java/module-info.java

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Jackson 3.x module-info for jackson-dataformat-xml Test artifact
2+
module tools.jackson.dataformat.xml
3+
{
4+
// First, same requires as the main artifact
5+
6+
requires java.xml;
7+
requires org.codehaus.stax2;
8+
9+
requires com.fasterxml.jackson.annotation;
10+
requires tools.jackson.core;
11+
requires tools.jackson.databind;
12+
13+
// Then test library dependencies
14+
requires junit;
15+
requires org.junit.jupiter.api;
16+
requires org.junit.jupiter.params;
17+
18+
// Then exports same as main artifact
19+
20+
exports tools.jackson.dataformat.xml;
21+
exports tools.jackson.dataformat.xml.annotation;
22+
exports tools.jackson.dataformat.xml.deser;
23+
exports tools.jackson.dataformat.xml.ser;
24+
exports tools.jackson.dataformat.xml.util;
25+
26+
provides tools.jackson.core.TokenStreamFactory with
27+
tools.jackson.dataformat.xml.XmlFactory;
28+
provides tools.jackson.databind.ObjectMapper with
29+
tools.jackson.dataformat.xml.XmlMapper;
30+
}

src/test/java/tools/jackson/dataformat/xml/interop/NonWoodstoxStaxImpl482Test.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)