Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
13 changes: 13 additions & 0 deletions javax-money/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,19 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<annotationProcessorPaths>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per some comments, this section should no longer be needed and may even be counter-productive.
Does not seem to make any difference in this case wrt failure.

<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
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,10 @@

requires java.money;

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

exports tools.jackson.datatype.javax.money;

provides tools.jackson.databind.JacksonModule with
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package tools.jackson.datatype.javax.money;

import javax.money.CurrencyUnit;
import javax.money.MonetaryAmount;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Objects;

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
27 changes: 27 additions & 0 deletions javax-money/src/test/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// 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;
requires static lombok;

// 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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

import com.kjetland.jackson.jsonSchema.JsonSchemaGenerator;

import tools.jackson.datatype.javax.money.JavaxMoneyModule;

import tools.jackson.databind.JsonNode;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.json.JsonMapper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import org.junit.jupiter.api.Test;

import tools.jackson.datatype.javax.money.FieldNames;

import static org.assertj.core.api.Assertions.assertThat;

public final class FieldNamesTest
Expand Down
Loading