Skip to content

Commit a61917b

Browse files
keilwkeilw
authored
Merge pull request #413 from kewne/master
fix: Create test module to test SPI
2 parents 43ddbc9 + 6ca9cce commit a61917b

File tree

6 files changed

+102
-4
lines changed

6 files changed

+102
-4
lines changed

‎moneta-test/pom.xml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.javamoney</groupId>
6+
<artifactId>moneta-parent</artifactId>
7+
<version>1.4.4</version>
8+
</parent>
9+
10+
<artifactId>moneta-test</artifactId>
11+
<packaging>jar</packaging>
12+
13+
<name>Moneta Test</name>
14+
<description>Module for testing Moneta Service loaders</description>
15+
16+
17+
<properties>
18+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
</properties>
20+
21+
<build>
22+
<plugins>
23+
<plugin>
24+
<groupId>org.apache.maven.plugins</groupId>
25+
<artifactId>maven-compiler-plugin</artifactId>
26+
<executions>
27+
<execution>
28+
<id>default-compile</id>
29+
<configuration>
30+
<!-- compile everything to ensure module-info contains right entries -->
31+
<!-- required when JAVA_HOME is JDK 8 or below -->
32+
<jdkToolchain>
33+
<version>${maven.compiler.release}</version>
34+
</jdkToolchain>
35+
<release>9</release>
36+
</configuration>
37+
</execution>
38+
<execution>
39+
<id>base-compile</id>
40+
<goals>
41+
<goal>compile</goal>
42+
</goals>
43+
<!-- recompile everything for target VM except the module-info.java -->
44+
<configuration>
45+
<source>8</source>
46+
<target>8</target>
47+
<release>8</release>
48+
<excludes>
49+
<exclude>module-info.java</exclude>
50+
</excludes>
51+
</configuration>
52+
</execution>
53+
</executions>
54+
</plugin>
55+
</plugins>
56+
</build>
57+
58+
59+
<dependencies>
60+
<dependency>
61+
<groupId>javax.money</groupId>
62+
<artifactId>money-api</artifactId>
63+
<version>${jsr.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.javamoney.moneta</groupId>
67+
<artifactId>moneta-core</artifactId>
68+
<version>1.4.4</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>com.squareup.okhttp3</groupId>
72+
<artifactId>okhttp</artifactId>
73+
<version>${okhttp.version}</version>
74+
</dependency>
75+
<!-- OSGI support -->
76+
<dependency>
77+
<groupId>org.osgi</groupId>
78+
<artifactId>osgi.annotation</artifactId>
79+
<scope>provided</scope>
80+
<optional>true</optional>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.osgi</groupId>
84+
<artifactId>osgi.core</artifactId>
85+
<scope>provided</scope>
86+
<optional>true</optional>
87+
</dependency>
88+
</dependencies>
89+
</project>

‎moneta-test/src/main/java/module-info.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
module org.javamoney.moneta.test {
3+
requires java.money;
4+
requires org.javamoney.moneta;
5+
provides javax.money.spi.RoundingProviderSpi with org.javamoney.moneta.test.TestRoundingProvider;
6+
}

‎moneta-core/src/test/java/org/javamoney/moneta/function/TestRoundingProvider.java‎ renamed to ‎moneta-test/src/main/java/org/javamoney/moneta/test/TestRoundingProvider.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
* License for the specific language governing permissions and limitations under
1414
* the License.
1515
*/
16-
package org.javamoney.moneta.function;
16+
package org.javamoney.moneta.test;
17+
18+
import org.javamoney.moneta.function.MonetaryOperators;
1719

1820
import javax.money.*;
1921
import javax.money.spi.RoundingProviderSpi;

‎moneta-core/src/test/resources/META-INF/services/javax.money.spi.RoundingProviderSpi‎ renamed to ‎moneta-test/src/main/resources/META-INF/services/javax.money.spi.RoundingProviderSpi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# License for the specific language governing permissions and limitations under
1313
# the License.
1414
#
15-
org.javamoney.moneta.function.TestRoundingProvider
15+
org.javamoney.moneta.test.TestRoundingProvider

‎moneta-core/src/test/java/org/javamoney/moneta/function/MonetaryRoundingsTest.java‎ renamed to ‎moneta-test/src/test/java/org/javamoney/moneta/test/MonetaryRoundingsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* License for the specific language governing permissions and limitations under
1414
* the License.
1515
*/
16-
package org.javamoney.moneta.function;
16+
package org.javamoney.moneta.test;
1717

1818
import org.javamoney.moneta.CurrencyUnitBuilder;
1919
import org.javamoney.moneta.Money;

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,5 +654,6 @@
654654
<module>moneta-core</module>
655655
<module>moneta-convert</module>
656656
<module>moneta</module>
657-
</modules>
657+
<module>moneta-test</module>
658+
</modules>
658659
</project>

0 commit comments

Comments
 (0)