Skip to content

Commit a5dcf21

Browse files
keilwkeilw
committed
IN PROGRESS - issue JAVAMONEY-23: Extended JSR Scope
https://java.net/jira/browse/JAVAMONEY-23
1 parent 32b019a commit a5dcf21

File tree

7 files changed

+57
-14
lines changed

7 files changed

+57
-14
lines changed

‎.classpath

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
915
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
1016
<attributes>
1117
<attribute name="maven.pomderived" value="true"/>

‎.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
</buildCommand>
1818
</buildSpec>
1919
<natures>
20+
<nature>org.eclipse.pde.PluginNature</nature>
2021
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2122
<nature>org.eclipse.jdt.core.javanature</nature>
2223
</natures>

‎pom.xml

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,54 @@
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
<modelVersion>4.0.0</modelVersion>
4-
5-
<groupId>net.java.javamoney</groupId>
6-
<version>1.0-SNAPSHOT</version>
4+
5+
<groupId>org.javamoney</groupId>
6+
<version>0.2-SNAPSHOT</version>
77
<artifactId>money-extras</artifactId>
8-
<name>JMoney and Currency - Extras not part of JSR 354</name>
9-
<packaging>jar</packaging>
10-
8+
<name>Money and Currency - Extras not part of JSR 354</name>
9+
<packaging>bundle</packaging>
10+
1111
<properties>
12-
<javamoney.version>1.0-SNAPSHOT</javamoney.version>
12+
<jdkVersion>1.7</jdkVersion>
13+
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
14+
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
15+
<javamoney.version>0.5-SNAPSHOT</javamoney.version>
1316
</properties>
14-
17+
1518
<build>
19+
<pluginManagement>
20+
<plugins>
21+
<!-- ======================================================= -->
22+
<!-- Packaging (OSGi bundle) -->
23+
<!-- ======================================================= -->
24+
<plugin>
25+
<groupId>org.apache.felix</groupId>
26+
<artifactId>maven-bundle-plugin</artifactId>
27+
<version>2.3.5</version>
28+
<extensions>true</extensions>
29+
<configuration>
30+
<instructions>
31+
<Export-Package>org.javamoney.*</Export-Package>
32+
<Private-Package>!*</Private-Package>
33+
</instructions>
34+
</configuration>
35+
</plugin>
36+
37+
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-compiler-plugin</artifactId>
41+
<version>2.1</version>
42+
<configuration>
43+
<debug>true</debug>
44+
<optimize>true</optimize>
45+
<source>${maven.compile.sourceLevel}</source>
46+
<target>${maven.compile.targetLevel}</target>
47+
<encoding>${project.build.sourceEncoding}</encoding>
48+
</configuration>
49+
</plugin>
50+
</plugins>
51+
</pluginManagement>
1652
<plugins>
1753
<!-- ======================================================= -->
1854
<!-- Packaging (OSGi bundle) -->
@@ -24,9 +60,9 @@
2460
</plugins>
2561
</build>
2662
<dependencies>
27-
<dependency>
63+
<dependency>
2864
<groupId>javax.money</groupId>
29-
<artifactId>money-platform-ri</artifactId>
65+
<artifactId>money-ri-platform</artifactId>
3066
<version>${javamoney.version}</version>
3167
</dependency>
3268
<dependency>

‎src/main/java/net/java/javamoney/extras/CompoundType.java renamed to ‎src/main/java/org/javamoney/extras/CompoundType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2012-2013, Credit Suisse
77
* All rights reserved.
88
*/
9-
package net.java.javamoney.extras;
9+
package org.javamoney.extras;
1010

1111
import java.util.Map;
1212

‎src/main/java/net/java/javamoney/extras/CompoundValue.java renamed to ‎src/main/java/org/javamoney/extras/CompoundValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2012-2013, Credit Suisse
77
* All rights reserved.
88
*/
9-
package net.java.javamoney.extras;
9+
package org.javamoney.extras;
1010

1111
import java.util.Map;
1212

‎src/main/java/net/java/javamoney/extras/MultiValue.java renamed to ‎src/main/java/org/javamoney/extras/MultiValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Contributors:
1717
* Anatole Tresch - initial version.
1818
*/
19-
package net.java.javamoney.extras;
19+
package org.javamoney.extras;
2020

2121
import java.util.HashMap;
2222
import java.util.Map;

‎src/main/java/net/java/javamoney/extras/ValidationException.java renamed to ‎src/main/java/org/javamoney/extras/ValidationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2012-2013, Credit Suisse
77
* All rights reserved.
88
*/
9-
package net.java.javamoney.extras;
9+
package org.javamoney.extras;
1010

1111
import javax.money.MonetaryException;
1212

0 commit comments

Comments
 (0)