Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5f5f18e
Fix #887: use `module-info.java` natively
cowtowncoder Jan 20, 2025
538fe34
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Jan 20, 2025
cce8cf4
Trying to get module info to work (added annotations dep with version…
cowtowncoder Jan 21, 2025
2d336c1
Remove unnecessary module dependency
cowtowncoder Jan 21, 2025
dc8cb9b
Remove empty surefire plug-in definition
cowtowncoder Jan 21, 2025
4c96552
Remote a dep, resolve missing-junit problem. But still failing later on.
cowtowncoder Jan 21, 2025
573a972
...
cowtowncoder Jan 22, 2025
c7c4a75
...
cowtowncoder Jan 22, 2025
27d8c9b
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Jan 22, 2025
6c47449
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Jan 22, 2025
fc4ea18
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Jan 23, 2025
8ac8f2b
Merge branch 'tatu/3.0/887-use-module-info' of github.com:FasterXML/j…
cowtowncoder Jan 23, 2025
d31d991
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Jan 25, 2025
d76a0f1
...
cowtowncoder Jan 25, 2025
041284a
Try furiously to get src/test/java/module-info.java to be used
cowtowncoder Jan 25, 2025
0a674b4
Remove unnecessary import
cowtowncoder Jan 31, 2025
3a72206
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Jan 31, 2025
002130c
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Feb 3, 2025
bf0a035
...
cowtowncoder Feb 4, 2025
c788e21
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Feb 7, 2025
db59b56
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Feb 11, 2025
2f1678d
Minor fixing of test module-info.java (but still no go)
cowtowncoder Feb 11, 2025
8a0dd22
...
cowtowncoder Feb 11, 2025
bad36e8
Add missing module dep for tests
cowtowncoder Feb 11, 2025
81e7a75
Merge branch 'master' into tatu/3.0/887-use-module-info
cowtowncoder Feb 11, 2025
8488bb7
Remove unnecessary source dir additions
cowtowncoder Feb 11, 2025
67b3256
...
cowtowncoder Feb 11, 2025
bf56d81
Merge branch '3.x' into tatu/3.0/887-use-module-info
cowtowncoder Apr 8, 2025
b0e7c31
Merge branch '3.x' into tatu/3.0/887-use-module-info
cowtowncoder Apr 10, 2025
0f80874
Remove jsr310 module dep from module-info (now that it's part of data…
cowtowncoder Apr 10, 2025
6e90128
Merge branch '3.x' into tatu/3.0/887-use-module-info
cowtowncoder Apr 11, 2025
c0a3355
Put back surefire plugin settings
cowtowncoder Apr 12, 2025
c326f73
Try disabling JPMS for tests
cowtowncoder Apr 12, 2025
2a440fa
Update release notes
cowtowncoder Apr 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,10 @@
<goal>test-compile</goal>
</goals>
<configuration>
<args>
</args>
<sourceDirs>
<source>${project.basedir}/src/test/java</source>
<source>${project.basedir}/src/test/kotlin</source>
</sourceDirs>
</configuration>
</execution>
</executions>
Expand All @@ -179,6 +181,10 @@
-->
<include>tools.jackson.module.kotlin.**</include>
</includes>
<!-- 11-Apr-2025, tatu: Cannot make JPMS work here, no matter what.
So... turn it off
-->
<useModulePath>false</useModulePath>
</configuration>
</plugin>
<plugin>
Expand All @@ -196,12 +202,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>org.gradlex</groupId>
Expand Down
1 change: 1 addition & 0 deletions release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Former maintainers:

3.0.0-rc3 (not yet released)

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

3.0.0-rc2 (28-Mar-2025)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// Kotlin module-info for Main artifact
module tools.jackson.module.kotlin
{
requires java.desktop;

requires kotlin.reflect;
requires transitive kotlin.stdlib;
requires org.jetbrains.annotations;

requires com.fasterxml.jackson.annotation;
requires tools.jackson.core;
Expand Down