Skip to content

Commit bfb7662

Browse files
keilwkeilw
committed
Updated poms
1 parent 12d68b2 commit bfb7662

File tree

7 files changed

+163
-76
lines changed

7 files changed

+163
-76
lines changed

‎exchange/exchange-rate-frb/pom.xml

Lines changed: 74 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,41 +38,18 @@
3838
<uri>https://www.federalreserve.gov/feeds/data/H10_H10.XML</uri>
3939
<overwrite>true</overwrite>
4040
<outputDirectory>src/main/resources/java-money/defaults/FRB</outputDirectory>
41-
<outputFile>H10_H10.XML</outputFile>
4241
</configuration>
4342
</plugin>
4443
<plugin>
4544
<groupId>org.apache.maven.plugins</groupId>
4645
<artifactId>maven-compiler-plugin</artifactId>
47-
<version>3.7.0</version>
4846
<configuration>
49-
<source>9</source>
50-
<target>9</target>
47+
<source>1.8</source>
48+
<target>1.8</target>
49+
<compilerArgs>
50+
<arg>-Xlint:all</arg>
51+
</compilerArgs>
5152
</configuration>
52-
<executions>
53-
<execution>
54-
<id>default-compile</id>
55-
<configuration>
56-
<!-- compile everything to ensure module-info contains right entries -->
57-
<!-- required when JAVA_HOME is JDK 8 or below -->
58-
<jdkToolchain>
59-
<version>9</version>
60-
</jdkToolchain>
61-
<release>9</release>
62-
</configuration>
63-
</execution>
64-
<execution>
65-
<id>base-compile</id>
66-
<goals>
67-
<goal>compile</goal>
68-
</goals>
69-
<!-- recompile everything for target VM except the module-info.java -->
70-
<configuration>
71-
<source>${maven.compile.sourceLevel}</source>
72-
<target>${maven.compile.targetLevel}</target>
73-
</configuration>
74-
</execution>
75-
</executions>
7653
</plugin>
7754
</plugins>
7855
</build>
@@ -110,20 +87,85 @@
11087
<scope>provided</scope>
11188
<optional>true</optional>
11289
</dependency>
90+
11391
<dependency>
114-
<groupId>jakarta.xml.bind</groupId>
115-
<artifactId>jakarta.xml.bind-api</artifactId>
92+
<groupId>javax.xml.bind</groupId>
93+
<artifactId>jaxb-api</artifactId>
11694
</dependency>
11795
<dependency>
11896
<groupId>org.glassfish.jaxb</groupId>
119-
<artifactId>jaxb-bom</artifactId>
120-
<type>pom</type>
97+
<artifactId>jaxb-runtime</artifactId>
98+
<scope>runtime</scope>
12199
</dependency>
100+
122101
<!-- testing -->
123102
<dependency>
124103
<groupId>org.testng</groupId>
125104
<artifactId>testng</artifactId>
126105
<scope>test</scope>
127106
</dependency>
128107
</dependencies>
108+
109+
<profiles>
110+
<profile>
111+
<id>jdk9-setup</id>
112+
<activation>
113+
<jdk>[9,)</jdk>
114+
</activation>
115+
<build>
116+
<pluginManagement>
117+
<plugins>
118+
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
120+
<artifactId>maven-compiler-plugin</artifactId>
121+
<configuration>
122+
<release>8</release>
123+
</configuration>
124+
<executions>
125+
<execution>
126+
<id>default-compile</id>
127+
<configuration>
128+
<release>9</release>
129+
<source>9</source>
130+
<target>9</target>
131+
</configuration>
132+
</execution>
133+
<execution>
134+
<id>base-compile</id>
135+
<goals>
136+
<goal>compile</goal>
137+
</goals>
138+
<configuration>
139+
<excludes>
140+
<exclude>module-info.java</exclude>
141+
</excludes>
142+
</configuration>
143+
</execution>
144+
</executions>
145+
</plugin>
146+
</plugins>
147+
</pluginManagement>
148+
<plugins>
149+
<plugin>
150+
<groupId>org.codehaus.mojo</groupId>
151+
<artifactId>build-helper-maven-plugin</artifactId>
152+
<executions>
153+
<execution>
154+
<id>add-jdk9-source</id>
155+
<phase>generate-sources</phase>
156+
<goals>
157+
<goal>add-source</goal>
158+
</goals>
159+
<configuration>
160+
<sources>
161+
<source>src/main/jdk9</source>
162+
</sources>
163+
</configuration>
164+
</execution>
165+
</executions>
166+
</plugin>
167+
</plugins>
168+
</build>
169+
</profile>
170+
</profiles>
129171
</project>

‎exchange/exchange-rate-frb/src/main/java9/module-info.java renamed to ‎exchange/exchange-rate-frb/src/main/jdk9/module-info.java

File renamed without changes.

‎exchange/exchange-rate-yahoo/pom.xml

Lines changed: 73 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
License for the specific language governing permissions and limitations under
1717
the License.
1818
19-
Contributors: @atsticks, @keilw, @otjava, @manuela-grindei
19+
Contributors: @atsticks, @keilw, @otaviojava, @manuela-grindei
2020
-->
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
@@ -52,35 +52,13 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-compiler-plugin</artifactId>
55-
<version>3.7.0</version>
5655
<configuration>
57-
<source>9</source>
58-
<target>9</target>
56+
<source>1.8</source>
57+
<target>1.8</target>
58+
<compilerArgs>
59+
<arg>-Xlint:all</arg>
60+
</compilerArgs>
5961
</configuration>
60-
<executions>
61-
<execution>
62-
<id>default-compile</id>
63-
<configuration>
64-
<!-- compile everything to ensure module-info contains right entries -->
65-
<!-- required when JAVA_HOME is JDK 8 or below -->
66-
<jdkToolchain>
67-
<version>9</version>
68-
</jdkToolchain>
69-
<release>9</release>
70-
</configuration>
71-
</execution>
72-
<execution>
73-
<id>base-compile</id>
74-
<goals>
75-
<goal>compile</goal>
76-
</goals>
77-
<!-- recompile everything for target VM except the module-info.java -->
78-
<configuration>
79-
<source>${maven.compile.sourceLevel}</source>
80-
<target>${maven.compile.targetLevel}</target>
81-
</configuration>
82-
</execution>
83-
</executions>
8462
</plugin>
8563
</plugins>
8664
</build>
@@ -99,15 +77,13 @@
9977
</dependency>
10078

10179
<dependency>
102-
<groupId>jakarta.xml.bind</groupId>
103-
<artifactId>jakarta.xml.bind-api</artifactId>
104-
<version>2.3.2</version>
80+
<groupId>javax.xml.bind</groupId>
81+
<artifactId>jaxb-api</artifactId>
10582
</dependency>
10683
<dependency>
10784
<groupId>org.glassfish.jaxb</groupId>
108-
<artifactId>jaxb-bom</artifactId>
109-
<type>pom</type>
110-
<version>2.3.2</version>
85+
<artifactId>jaxb-runtime</artifactId>
86+
<scope>runtime</scope>
11187
</dependency>
11288

11389
<!-- OSGI support -->
@@ -139,4 +115,67 @@
139115
<scope>test</scope>
140116
</dependency>
141117
</dependencies>
118+
119+
<profiles>
120+
<profile>
121+
<id>jdk9-setup</id>
122+
<activation>
123+
<jdk>[9,)</jdk>
124+
</activation>
125+
<build>
126+
<pluginManagement>
127+
<plugins>
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-compiler-plugin</artifactId>
131+
<configuration>
132+
<release>8</release>
133+
</configuration>
134+
<executions>
135+
<execution>
136+
<id>default-compile</id>
137+
<configuration>
138+
<release>9</release>
139+
<source>9</source>
140+
<target>9</target>
141+
</configuration>
142+
</execution>
143+
<execution>
144+
<id>base-compile</id>
145+
<goals>
146+
<goal>compile</goal>
147+
</goals>
148+
<configuration>
149+
<excludes>
150+
<exclude>module-info.java</exclude>
151+
</excludes>
152+
</configuration>
153+
</execution>
154+
</executions>
155+
</plugin>
156+
</plugins>
157+
</pluginManagement>
158+
<plugins>
159+
<plugin>
160+
<groupId>org.codehaus.mojo</groupId>
161+
<artifactId>build-helper-maven-plugin</artifactId>
162+
<executions>
163+
<execution>
164+
<id>add-jdk9-source</id>
165+
<phase>generate-sources</phase>
166+
<goals>
167+
<goal>add-source</goal>
168+
</goals>
169+
<configuration>
170+
<sources>
171+
<source>src/main/jdk9</source>
172+
</sources>
173+
</configuration>
174+
</execution>
175+
</executions>
176+
</plugin>
177+
</plugins>
178+
</build>
179+
</profile>
180+
</profiles>
142181
</project>

‎exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooQuoteItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2018, Werner Keil, Anatole Tresch and others.
2+
* Copyright (c) 2012, 2020, Werner Keil, Anatole Tresch and others.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
55
* use this file except in compliance with the License. You may obtain a copy of

‎exchange/exchange-rate-yahoo/src/main/java9/module-info.java renamed to ‎exchange/exchange-rate-yahoo/src/main/jdk9/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
requires static org.osgi.annotation;
1919
provides javax.money.convert.ExchangeRateProvider with
2020
YahooRateProvider;
21-
uses org.javamoney.moneta.spi.LoaderService;
21+
uses org.javamoney.moneta.spi.loader.LoaderService;
2222
uses org.javamoney.moneta.spi.MonetaryAmountProducer;
2323

2424
}

‎exchange/pom.xml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
<artifactId>download-maven-plugin</artifactId>
4242
<version>1.4.0</version>
4343
</plugin>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>build-helper-maven-plugin</artifactId>
47+
<version>3.0.0</version>
48+
</plugin>
4449
</plugins>
4550
</pluginManagement>
4651
</build>
@@ -67,15 +72,15 @@
6772

6873
<!-- XML support -->
6974
<dependency>
70-
<groupId>jakarta.xml.bind</groupId>
71-
<artifactId>jakarta.xml.bind-api</artifactId>
72-
<version>2.3.2</version>
75+
<groupId>javax.xml.bind</groupId>
76+
<artifactId>jaxb-api</artifactId>
77+
<version>2.3.1</version>
7378
</dependency>
7479
<dependency>
7580
<groupId>org.glassfish.jaxb</groupId>
76-
<artifactId>jaxb-bom</artifactId>
77-
<type>pom</type>
78-
<version>2.3.2</version>
81+
<artifactId>jaxb-runtime</artifactId>
82+
<version>2.3.1</version>
83+
<scope>runtime</scope>
7984
</dependency>
8085

8186
<!-- OSGI support -->

‎pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-->
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
22-
<version>1.1</version>
22+
<version>1.2-SNAPSHOT</version>
2323
<groupId>org.javamoney</groupId>
2424
<artifactId>javamoney-parent</artifactId>
2525
</parent>
@@ -142,7 +142,7 @@
142142
<plugin>
143143
<groupId>org.apache.maven.plugins</groupId>
144144
<artifactId>maven-jar-plugin</artifactId>
145-
<version>2.6</version>
145+
<version>3.2.0</version>
146146
<configuration>
147147
<archive>
148148
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -259,6 +259,7 @@
259259
<plugin>
260260
<groupId>org.apache.maven.plugins</groupId>
261261
<artifactId>maven-javadoc-plugin</artifactId>
262+
<version>3.2.0</version>
262263
<configuration>
263264
<source>1.9</source>
264265
<failOnError>false</failOnError>

0 commit comments

Comments
 (0)