Skip to content

Commit 7ddcde3

Browse files
keilwkeilw
committed
JAVAMONEY-82: Parent POM of RI (1.0-RC1) not in codebase, differs from
TCK Task-Url: https://java.net/jira/browse/JAVAMONEY-82
1 parent ca716da commit 7ddcde3

File tree

12 files changed

+98
-91
lines changed

12 files changed

+98
-91
lines changed

‎console/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.javamoney.examples</groupId>
66
<artifactId>javamoney-examples</artifactId>
7-
<version>0.9-SNAPSHOT</version>
7+
<version>0.9</version>
88
</parent>
99
<groupId>org.javamoney.examples.console</groupId>
1010
<artifactId>javamoney-examples-console</artifactId>

‎javafx/money-fxdemo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.javamoney.examples</groupId>
77
<artifactId>javamoney-examples-javafx</artifactId>
8-
<version>0.9-SNAPSHOT</version>
8+
<version>0.9</version>
99
</parent>
1010
<organization>
1111
<name>JSR 354</name>

‎javafx/money-javafx-binding/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>javamoney-examples-javafx</artifactId>
99
<groupId>org.javamoney.examples</groupId>
10-
<version>0.9-SNAPSHOT</version>
10+
<version>0.9</version>
1111
</parent>
1212

1313
<artifactId>javamoney-fxbinding</artifactId>

‎javafx/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>javamoney-examples</artifactId>
66
<groupId>org.javamoney.examples</groupId>
7-
<version>0.9-SNAPSHOT</version>
7+
<version>0.9</version>
88
</parent>
99
<artifactId>javamoney-examples-javafx</artifactId>
1010
<packaging>pom</packaging>

‎swing/javamoney-ez/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.javamoney.examples</groupId>
66
<artifactId>javamoney-examples-swing</artifactId>
7-
<version>0.9-SNAPSHOT</version>
7+
<version>0.9</version>
88
</parent>
99
<groupId>org.javamoney.examples.ez</groupId>
1010
<artifactId>javamoney-ez</artifactId>

‎swing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.javamoney.examples</groupId>
66
<artifactId>javamoney-examples</artifactId>
7-
<version>0.9-SNAPSHOT</version>
7+
<version>0.9</version>
88
</parent>
99
<artifactId>javamoney-examples-swing</artifactId>
1010
<name>Java Money and Currency Swing RCP Examples</name>

‎web/javamoney-payment-cdi-event/pom.xml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<modelVersion>4.0.0</modelVersion>
1515
<parent>
1616
<groupId>org.javamoney.examples</groupId>
17-
<version>0.9-SNAPSHOT</version>
17+
<version>0.9</version>
1818
<artifactId>javamoney-examples-web</artifactId>
1919
</parent>
2020
<artifactId>javamoney-payment-cdi-event</artifactId>
@@ -52,9 +52,6 @@
5252
<!-- maven-compiler-plugin -->
5353
<maven.compiler.target>1.6</maven.compiler.target>
5454
<maven.compiler.source>1.6</maven.compiler.source>
55-
<!-- JSR versions -->
56-
<version.jsr>0.8-SNAPSHOT</version.jsr>
57-
<version.org.javamoney>0.4-SNAPSHOT</version.org.javamoney>
5855
</properties>
5956
<dependencyManagement>
6057
<dependencies>
@@ -79,21 +76,35 @@
7976
<type>pom</type>
8077
<scope>import</scope>
8178
</dependency>
82-
<dependency>
83-
<groupId>org.javamoney.bundles</groupId>
84-
<artifactId>javamoney-ee</artifactId>
85-
<version>${version.org.javamoney}</version>
86-
</dependency>
8779
<!-- Needed for running tests (you may also use TestNG) -->
8880
<dependency>
8981
<groupId>junit</groupId>
9082
<artifactId>junit</artifactId>
9183
<version>4.8.2</version>
9284
<scope>test</scope>
9385
</dependency>
86+
<dependency>
87+
<groupId>javax.money</groupId>
88+
<artifactId>money-api</artifactId>
89+
<version>${jsr.version}</version>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.javamoney</groupId>
93+
<artifactId>moneta</artifactId>
94+
<version>${jsr.version}</version>
95+
</dependency>
9496
</dependencies>
9597
</dependencyManagement>
98+
9699
<dependencies>
100+
<dependency>
101+
<groupId>javax.money</groupId>
102+
<artifactId>money-api</artifactId>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.javamoney</groupId>
106+
<artifactId>moneta</artifactId>
107+
</dependency>
97108
<!-- Import the CDI API, we use provided scope as the API is included in
98109
JBoss AS 7 -->
99110
<dependency>
@@ -122,10 +133,6 @@
122133
<groupId>org.hibernate</groupId>
123134
<artifactId>hibernate-validator</artifactId>
124135
</dependency>
125-
<dependency>
126-
<groupId>org.javamoney.bundles</groupId>
127-
<artifactId>javamoney-ee</artifactId>
128-
</dependency>
129136
<dependency>
130137
<groupId>junit</groupId>
131138
<artifactId>junit</artifactId>

‎web/javamoney-payment-cdi-event/src/main/java/org/javamoney/examples/cdi/payment/beans/PaymentBean.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import javax.money.MonetaryAmount;
3333
import javax.money.MonetaryCurrencies;
3434

35-
import org.javamoney.annotation.Amount;
35+
//import org.javamoney.annotation.Amount;
3636
import org.javamoney.examples.cdi.payment.events.PaymentEvent;
3737
import org.javamoney.examples.cdi.payment.events.PaymentType;
3838
import org.javamoney.examples.cdi.payment.qualifiers.Credit;
@@ -66,12 +66,12 @@ public class PaymentBean implements Serializable {
6666
private static final CurrencyUnit CURRENCY = MonetaryCurrencies
6767
.getCurrency("EUR");
6868

69-
@Amount
69+
// @Amount
7070
private BigDecimal amount = new BigDecimal(10.0);
7171
// private final CurrencyUnit DOLLAR = MoneyCurrency.getInstance("ISO4217",
7272
// "USD");
7373

74-
@Amount
74+
// @Amount
7575
private MonetaryAmount money = Money.of(amount, CURRENCY);
7676

7777
public MonetaryAmount getMoney() {

‎web/javamoney-payment-cdi-event/src/test/java/org/javamoney/examples/cdi/payment/SmokeTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
import static org.junit.Assert.assertEquals;
1919

20+
import java.math.BigDecimal;
21+
2022
import org.javamoney.moneta.Money;
2123
import org.junit.Test;
2224
import org.slf4j.Logger;
2325
import org.slf4j.LoggerFactory;
2426

25-
import com.ibm.icu.math.BigDecimal;
26-
2727
/**
2828
*
2929
* @author Werner Keil

‎web/javamoney-tradingapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>javamoney-examples-web</artifactId>
77
<groupId>org.javamoney.examples</groupId>
8-
<version>0.9-SNAPSHOT</version>
8+
<version>0.9</version>
99
</parent>
1010
<artifactId>javamoney-tradingapp</artifactId>
1111
<packaging>war</packaging>

0 commit comments

Comments
 (0)