Skip to content

Commit 3a05a15

Browse files
keilwkeilw
committed
Updated dependencies
1 parent 4c85b4f commit 3a05a15

File tree

11 files changed

+118
-88
lines changed

11 files changed

+118
-88
lines changed

‎calc/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<!--
4-
Copyright (c) 2012, 2018, Werner Keil, Anatole Tresch and others.
4+
Copyright (c) 2012, 2020, Werner Keil, Anatole Tresch and others.
55
66
Licensed under the Apache License, Version 2.0 (the "License"); you may not
77
use this file except in compliance with the License. You may obtain a copy of
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.javamoney.lib</groupId>
2424
<artifactId>javamoney-lib</artifactId>
25-
<version>1.0</version>
25+
<version>1.1-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>javamoney-calc</artifactId>

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.javamoney.lib</groupId>
2424
<artifactId>javamoney-exchange</artifactId>
25-
<version>1.0</version>
25+
<version>1.1-SNAPSHOT</version>
2626
</parent>
2727
<artifactId>javamoney-exchange-frb</artifactId>
2828
<packaging>jar</packaging>
@@ -70,9 +70,6 @@
7070
<configuration>
7171
<source>${maven.compile.sourceLevel}</source>
7272
<target>${maven.compile.targetLevel}</target>
73-
<excludes>
74-
<exclude>org/javamoney/moneta/convert/frb/module-info.java</exclude>
75-
</excludes>
7673
</configuration>
7774
</execution>
7875
</executions>
@@ -86,13 +83,11 @@
8683
<artifactId>money-api</artifactId>
8784
</dependency>
8885
<dependency>
89-
<groupId>org.javamoney.moneta</groupId>
90-
<artifactId>moneta-core</artifactId>
91-
</dependency>
92-
<dependency>
93-
<groupId>org.javamoney.moneta</groupId>
94-
<artifactId>moneta-convert</artifactId>
86+
<groupId>org.javamoney</groupId>
87+
<artifactId>moneta</artifactId>
88+
<type>pom</type>
9589
</dependency>
90+
9691
<!-- OSGI support -->
9792
<dependency>
9893
<groupId>org.osgi</groupId>
@@ -115,6 +110,15 @@
115110
<scope>provided</scope>
116111
<optional>true</optional>
117112
</dependency>
113+
<dependency>
114+
<groupId>jakarta.xml.bind</groupId>
115+
<artifactId>jakarta.xml.bind-api</artifactId>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.glassfish.jaxb</groupId>
119+
<artifactId>jaxb-bom</artifactId>
120+
<type>pom</type>
121+
</dependency>
118122
<!-- testing -->
119123
<dependency>
120124
<groupId>org.testng</groupId>

‎exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/USFederalReserveRateProvider.java‎

Lines changed: 3 additions & 3 deletions
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
@@ -52,8 +52,8 @@
5252
import org.javamoney.moneta.convert.ExchangeRateBuilder;
5353
import org.javamoney.moneta.spi.AbstractRateProvider;
5454
import org.javamoney.moneta.spi.DefaultNumberValue;
55-
import org.javamoney.moneta.spi.LoaderService;
56-
import org.javamoney.moneta.spi.LoaderService.LoaderListener;
55+
import org.javamoney.moneta.spi.loader.LoaderService;
56+
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
5757

5858
/**
5959
* <p>

‎exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/module-info.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import org.javamoney.moneta.convert.frb.USFederalReserveRateProvider;
2+
3+
/*
4+
* Copyright (c) 2012, 2020, Werner Keil, Anatole Tresch and others.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
7+
* use this file except in compliance with the License. You may obtain a copy of
8+
* the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
14+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
15+
* License for the specific language governing permissions and limitations under
16+
* the License.
17+
*
18+
* Contributors: @keilw
19+
*/
20+
module org.javamoney.moneta.convert.frb {
21+
requires java.xml;
22+
requires java.xml.bind;
23+
requires org.javamoney.moneta;
24+
requires org.javamoney.moneta.convert;
25+
requires static org.osgi.core;
26+
requires static org.osgi.compendium;
27+
requires static org.osgi.annotation;
28+
provides javax.money.convert.ExchangeRateProvider with
29+
USFederalReserveRateProvider;
30+
uses org.javamoney.moneta.spi.loader.LoaderService;
31+
uses org.javamoney.moneta.spi.MonetaryAmountProducer;
32+
}

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<!--
5-
Copyright (c) 2012, 2018, Werner Keil, Anatole Tresch and others.
5+
Copyright (c) 2012, 2020, Werner Keil, Anatole Tresch and others.
66
77
Licensed under the Apache License, Version 2.0 (the "License"); you may not
88
use this file except in compliance with the License. You may obtain a copy of
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.javamoney.lib</groupId>
2424
<artifactId>javamoney-exchange</artifactId>
25-
<version>1.0</version>
25+
<version>1.1-SNAPSHOT</version>
2626
</parent>
2727
<artifactId>javamoney-exchange-yahoo</artifactId>
2828
<packaging>jar</packaging>
@@ -78,9 +78,6 @@
7878
<configuration>
7979
<source>${maven.compile.sourceLevel}</source>
8080
<target>${maven.compile.targetLevel}</target>
81-
<excludes>
82-
<exclude>org/javamoney/moneta/convert/yahoo/module-info.java</exclude>
83-
</excludes>
8481
</configuration>
8582
</execution>
8683
</executions>
@@ -95,12 +92,22 @@
9592
<artifactId>money-api</artifactId>
9693
</dependency>
9794
<dependency>
98-
<groupId>org.javamoney.moneta</groupId>
99-
<artifactId>moneta-core</artifactId>
95+
<groupId>org.javamoney</groupId>
96+
<artifactId>moneta</artifactId>
97+
<version>1.4</version>
98+
<type>pom</type>
99+
</dependency>
100+
101+
<dependency>
102+
<groupId>jakarta.xml.bind</groupId>
103+
<artifactId>jakarta.xml.bind-api</artifactId>
104+
<version>2.3.2</version>
100105
</dependency>
101106
<dependency>
102-
<groupId>org.javamoney.moneta</groupId>
103-
<artifactId>moneta-convert</artifactId>
107+
<groupId>org.glassfish.jaxb</groupId>
108+
<artifactId>jaxb-bom</artifactId>
109+
<type>pom</type>
110+
<version>2.3.2</version>
104111
</dependency>
105112

106113
<!-- OSGI support -->

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

Lines changed: 3 additions & 3 deletions
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
@@ -45,8 +45,8 @@
4545
import org.javamoney.moneta.convert.ExchangeRateBuilder;
4646
import org.javamoney.moneta.spi.AbstractRateProvider;
4747
import org.javamoney.moneta.spi.DefaultNumberValue;
48-
import org.javamoney.moneta.spi.LoaderService;
49-
import org.javamoney.moneta.spi.LoaderService.LoaderListener;
48+
import org.javamoney.moneta.spi.loader.LoaderService;
49+
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
5050
import org.javamoney.moneta.spi.MonetaryConfig;
5151

5252
/**

‎exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/module-info.java‎ renamed to ‎exchange/exchange-rate-yahoo/src/main/java9/module-info.java‎

File renamed without changes.

‎exchange/pom.xml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<!--
4-
Copyright (c) 2012, 2018, Werner Keil, Anatole Tresch and others.
4+
Copyright (c) 2012, 2020, Werner Keil, Anatole Tresch and others.
55
66
Licensed under the Apache License, Version 2.0 (the "License"); you may not
77
use this file except in compliance with the License. You may obtain a copy of
@@ -21,16 +21,16 @@
2121
<parent>
2222
<groupId>org.javamoney.lib</groupId>
2323
<artifactId>javamoney-lib</artifactId>
24-
<version>1.0</version>
24+
<version>1.1-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>javamoney-exchange</artifactId>
2727
<packaging>pom</packaging>
2828
<name>JavaMoney Exchange Libraries </name>
2929
<description>This parent has contains pluggable modules for JSR 354 like 3rd party exchange rate providers.</description>
3030

3131
<modules>
32-
<module>exchange-rate-yahoo</module>
3332
<module>exchange-rate-frb</module>
33+
<module>exchange-rate-yahoo</module>
3434
</modules>
3535

3636
<build>
@@ -59,15 +59,25 @@
5959
<version>${jsr.version}</version>
6060
</dependency>
6161
<dependency>
62-
<groupId>org.javamoney.moneta</groupId>
63-
<artifactId>moneta-core</artifactId>
62+
<groupId>org.javamoney</groupId>
63+
<artifactId>moneta</artifactId>
6464
<version>${ri.version}</version>
65+
<type>pom</type>
6566
</dependency>
67+
68+
<!-- XML support -->
6669
<dependency>
67-
<groupId>org.javamoney.moneta</groupId>
68-
<artifactId>moneta-convert</artifactId>
69-
<version>${ri.version}</version>
70+
<groupId>jakarta.xml.bind</groupId>
71+
<artifactId>jakarta.xml.bind-api</artifactId>
72+
<version>2.3.2</version>
7073
</dependency>
74+
<dependency>
75+
<groupId>org.glassfish.jaxb</groupId>
76+
<artifactId>jaxb-bom</artifactId>
77+
<type>pom</type>
78+
<version>2.3.2</version>
79+
</dependency>
80+
7181
<!-- OSGI support -->
7282
<dependency>
7383
<groupId>org.osgi</groupId>

‎javamoney-cdi/pom.xml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
5-
<artifactId>javamoney-lib</artifactId>
6-
<groupId>org.javamoney.lib</groupId>
7-
<version>1.0</version>
6+
<artifactId>javamoney-lib</artifactId>
7+
<groupId>org.javamoney.lib</groupId>
8+
<version>1.1-SNAPSHOT</version>
89
</parent>
9-
<artifactId>javamoney-cdi</artifactId>
10-
<name>Money and Currency - JavaMoney CDI Integration</name>
11-
<description>Implementation of JSR 354 Bootstrap mechanism that uses CDI in additiona to the ServiceLoader for
10+
<artifactId>javamoney-cdi</artifactId>
11+
<name>Money and Currency - JavaMoney CDI Integration</name>
12+
<description>Implementation of JSR 354 Bootstrap mechanism that uses CDI in additiona to the ServiceLoader for
1213
locating components.
1314
</description>
1415

15-
<dependencies>
16+
<dependencies>
1617
<dependency>
1718
<groupId>org.jboss.weld.se</groupId>
18-
<artifactId>weld-se</artifactId>
19-
<version>2.2.4.Final</version>
20-
<scope>provided</scope>
21-
</dependency>
19+
<artifactId>weld-se-core</artifactId>
20+
<version>3.1.4.Final</version>
21+
</dependency>
2222
<dependency>
23-
<groupId>javax.inject</groupId>
24-
<artifactId>javax.inject</artifactId>
25-
<version>1</version>
26-
<scope>provided</scope>
27-
</dependency>
28-
<dependency>
29-
<groupId>javax.money</groupId>
30-
<artifactId>money-api</artifactId>
31-
</dependency>
32-
<dependency>
33-
<groupId>org.javamoney.moneta</groupId>
34-
<artifactId>moneta-core</artifactId>
35-
<scope>test</scope>
36-
</dependency>
23+
<groupId>jakarta.inject</groupId>
24+
<artifactId>jakarta.inject-api</artifactId>
25+
<version>1.0</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>javax.money</groupId>
29+
<artifactId>money-api</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.javamoney.moneta</groupId>
33+
<artifactId>moneta-core</artifactId>
34+
<scope>test</scope>
35+
</dependency>
3736
</dependencies>
3837

3938
</project>

0 commit comments

Comments
 (0)