Skip to content

Commit a926d5e

Browse files
authored
Fix #56: add plain module-info.java's (#57)
1 parent 840ad77 commit a926d5e

File tree

8 files changed

+67
-11
lines changed

8 files changed

+67
-11
lines changed

javax-money/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@
8585
<groupId>com.google.code.maven-replacer-plugin</groupId>
8686
<artifactId>replacer</artifactId>
8787
</plugin>
88-
<plugin>
89-
<groupId>org.moditect</groupId>
90-
<artifactId>moditect-maven-plugin</artifactId>
91-
</plugin>
9288
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
9389
<plugin>
9490
<groupId>org.gradlex</groupId>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Hand-crafted 05-Nov-2024
1+
// Javax-money module Main artifact Module descriptor
22
module tools.jackson.datatype.javax.money
33
{
44
requires com.fasterxml.jackson.annotation;
@@ -7,6 +7,9 @@
77

88
requires java.money;
99

10+
// compile-time only dependencies
11+
requires static org.apiguardian.api;
12+
1013
exports tools.jackson.datatype.javax.money;
1114

1215
provides tools.jackson.databind.JacksonModule with

javax-money/src/main/java/tools/jackson/datatype/javax/money/MonetaryAmountDeserializer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import javax.money.CurrencyUnit;
77
import javax.money.MonetaryAmount;
88

9+
import javax.money.CurrencyUnit;
10+
import javax.money.MonetaryAmount;
11+
912
import tools.jackson.core.JsonParser;
1013
import tools.jackson.core.JsonToken;
1114
import tools.jackson.databind.DeserializationContext;
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Javax-money module (unit) Test Module descriptor
2+
module tools.jackson.datatype.javax.money
3+
{
4+
// Since we are not split from Main artifact, will not
5+
// need to depend on Main artifact -- but need its dependencies
6+
7+
requires com.fasterxml.jackson.annotation;
8+
requires tools.jackson.core;
9+
requires tools.jackson.databind;
10+
11+
requires java.money;
12+
13+
// compile-time only dependencies
14+
requires static org.apiguardian.api;
15+
16+
// Additional test lib/framework dependencies
17+
requires org.assertj.core;
18+
requires org.mockito;
19+
requires org.junit.jupiter.api;
20+
requires org.junit.jupiter.params;
21+
22+
requires org.javamoney.moneta;
23+
24+
// Further, need to open up test packages for JUnit et al
25+
opens tools.jackson.datatype.javax.money;
26+
}

moneta/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@
8989
<groupId>com.google.code.maven-replacer-plugin</groupId>
9090
<artifactId>replacer</artifactId>
9191
</plugin>
92-
<plugin>
93-
<groupId>org.moditect</groupId>
94-
<artifactId>moditect-maven-plugin</artifactId>
95-
</plugin>
9692
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
9793
<plugin>
9894
<groupId>org.gradlex</groupId>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
// Hand-crafted 29-Jan-2025
1+
// Moneta module Main artifact Module descriptor
22
module tools.jackson.datatype.moneta
33
{
44
requires com.fasterxml.jackson.annotation;
55
requires tools.jackson.core;
66
requires tools.jackson.databind;
77

88
requires tools.jackson.datatype.javax.money;
9-
109
requires java.money;
10+
requires org.javamoney.moneta;
11+
12+
// compile-time only dependencies
13+
requires static org.apiguardian.api;
1114

15+
1216
exports tools.jackson.datatype.moneta;
1317

1418
provides tools.jackson.databind.JacksonModule with
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Moneta module (unit) Test Module descriptor
2+
module tools.jackson.datatype.moneta
3+
{
4+
// Since we are not split from Main artifact, will not
5+
// need to depend on Main artifact -- but need its dependencies
6+
7+
requires com.fasterxml.jackson.annotation;
8+
requires tools.jackson.core;
9+
requires tools.jackson.databind;
10+
11+
requires tools.jackson.datatype.javax.money;
12+
requires java.money;
13+
requires org.javamoney.moneta;
14+
15+
// compile-time only dependencies
16+
requires static org.apiguardian.api;
17+
18+
// Additional test lib/framework dependencies
19+
requires org.assertj.core;
20+
requires org.mockito;
21+
requires org.junit.jupiter.api;
22+
requires org.junit.jupiter.params;
23+
24+
// Further, need to open up test packages for JUnit et al
25+
opens tools.jackson.datatype.moneta;
26+
}

release-notes/VERSION

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Modules:
1515

1616
3.0.0-rc3 (not yet released)
1717

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

2022
3.0.0-rc2 (28-Mar-2025)

0 commit comments

Comments
 (0)