Skip to content

Commit 70d8a3a

Browse files
authored
Fix #887: use module-info.java directly (#888)
1 parent 85e3787 commit 70d8a3a

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,10 @@
162162
<goal>test-compile</goal>
163163
</goals>
164164
<configuration>
165-
<args>
166-
</args>
165+
<sourceDirs>
166+
<source>${project.basedir}/src/test/java</source>
167+
<source>${project.basedir}/src/test/kotlin</source>
168+
</sourceDirs>
167169
</configuration>
168170
</execution>
169171
</executions>
@@ -179,6 +181,10 @@
179181
-->
180182
<include>tools.jackson.module.kotlin.**</include>
181183
</includes>
184+
<!-- 11-Apr-2025, tatu: Cannot make JPMS work here, no matter what.
185+
So... turn it off
186+
-->
187+
<useModulePath>false</useModulePath>
182188
</configuration>
183189
</plugin>
184190
<plugin>
@@ -196,12 +202,6 @@
196202
</configuration>
197203
</plugin>
198204

199-
<!-- 02-Nov-2020, tatu: Add JDK9+ module info with Moditect -->
200-
<plugin>
201-
<groupId>org.moditect</groupId>
202-
<artifactId>moditect-maven-plugin</artifactId>
203-
</plugin>
204-
205205
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
206206
<plugin>
207207
<groupId>org.gradlex</groupId>

release-notes/VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Former maintainers:
2424

2525
3.0.0-rc3 (not yet released)
2626

27+
#887: Change 3.0 to use `module-info.java` directly [JSTEP-11]
2728
- Branch rename "master" -> "3.x" [JSTEP-12]
2829

2930
3.0.0-rc2 (28-Mar-2025)

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// Kotlin module-info for Main artifact
22
module tools.jackson.module.kotlin
33
{
4-
requires java.desktop;
5-
64
requires kotlin.reflect;
75
requires transitive kotlin.stdlib;
6+
requires org.jetbrains.annotations;
87

98
requires com.fasterxml.jackson.annotation;
109
requires tools.jackson.core;

0 commit comments

Comments
 (0)