Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #56: add plain module-info.java's #57

Merged
merged 16 commits into from
Apr 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions javax-money/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
</plugin>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
</plugin>
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
<plugin>
<groupId>org.gradlex</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Hand-crafted 05-Nov-2024
// Javax-money module Main artifact Module descriptor
module tools.jackson.datatype.javax.money
{
requires com.fasterxml.jackson.annotation;
Expand All @@ -7,6 +7,9 @@

requires java.money;

// compile-time only dependencies
requires static org.apiguardian.api;

exports tools.jackson.datatype.javax.money;

provides tools.jackson.databind.JacksonModule with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import javax.money.CurrencyUnit;
import javax.money.MonetaryAmount;

import javax.money.CurrencyUnit;
import javax.money.MonetaryAmount;

import tools.jackson.core.JsonParser;
import tools.jackson.core.JsonToken;
import tools.jackson.databind.DeserializationContext;
Expand Down
26 changes: 26 additions & 0 deletions javax-money/src/test/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Javax-money module (unit) Test Module descriptor
module tools.jackson.datatype.javax.money
{
// Since we are not split from Main artifact, will not
// need to depend on Main artifact -- but need its dependencies

requires com.fasterxml.jackson.annotation;
requires tools.jackson.core;
requires tools.jackson.databind;

requires java.money;

// compile-time only dependencies
requires static org.apiguardian.api;

// Additional test lib/framework dependencies
requires org.assertj.core;
requires org.mockito;
requires org.junit.jupiter.api;
requires org.junit.jupiter.params;

requires org.javamoney.moneta;

// Further, need to open up test packages for JUnit et al
opens tools.jackson.datatype.javax.money;
}
4 changes: 0 additions & 4 deletions moneta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
</plugin>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
</plugin>
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
<plugin>
<groupId>org.gradlex</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
// Hand-crafted 29-Jan-2025
// Moneta module Main artifact Module descriptor
module tools.jackson.datatype.moneta
{
requires com.fasterxml.jackson.annotation;
requires tools.jackson.core;
requires tools.jackson.databind;

requires tools.jackson.datatype.javax.money;

requires java.money;
requires org.javamoney.moneta;

// compile-time only dependencies
requires static org.apiguardian.api;


exports tools.jackson.datatype.moneta;

provides tools.jackson.databind.JacksonModule with
Expand Down
26 changes: 26 additions & 0 deletions moneta/src/test/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Moneta module (unit) Test Module descriptor
module tools.jackson.datatype.moneta
{
// Since we are not split from Main artifact, will not
// need to depend on Main artifact -- but need its dependencies

requires com.fasterxml.jackson.annotation;
requires tools.jackson.core;
requires tools.jackson.databind;

requires tools.jackson.datatype.javax.money;
requires java.money;
requires org.javamoney.moneta;

// compile-time only dependencies
requires static org.apiguardian.api;

// Additional test lib/framework dependencies
requires org.assertj.core;
requires org.mockito;
requires org.junit.jupiter.api;
requires org.junit.jupiter.params;

// Further, need to open up test packages for JUnit et al
opens tools.jackson.datatype.moneta;
}
2 changes: 2 additions & 0 deletions release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Modules:

3.0.0-rc3 (not yet released)

#56: Change `jackson-datatype-javax-money`, `jackson-datatype-moneta`
to directly use JPMS [JSTEP-11]
- Branch rename "master" -> "3.x" [JSTEP-12]

3.0.0-rc2 (28-Mar-2025)
Expand Down
Loading