/issues/63 Fixed compilation config for supporting Java 9 modules.

Author: atsticks

pom.xml

@@ -523,34 +523,6 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.7.0</version>
-					<configuration>
-						<debug>true</debug>
-						<optimize>true</optimize>
-						<verbose>false</verbose>
-						<source>${maven.compile.sourceLevel}</source>
-						<target>${maven.compile.targetLevel}</target>
-						<compilerArgument>-g</compilerArgument>
-						<encoding>${project.build.sourceEncoding}</encoding>
-					</configuration>
-					<executions>
-						<execution>
-							<id>default</id>
-							<configuration>
-								<excludes>
-									<exclude>module-info.java</exclude>
-								</excludes>
-							</configuration>
-						</execution>
-						<execution>
-							<id>moduledesc</id>
-							<configuration>
-								<includes>
-									<include>module-info.java</include>
-								</includes>
-								<release>1.9</release>
-							</configuration>
-						</execution>
-					</executions>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -810,6 +782,43 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
+				<executions>
+					<execution>
+						<id>default-compile</id>
+						<configuration>
+							<!-- compile everything to ensure module-info contains right entries -->
+							<!-- required when JAVA_HOME is JDK 8 or below -->
+							<jdkToolchain>
+								<version>9</version>
+							</jdkToolchain>
+							<release>9</release>
+						</configuration>
+					</execution>
+					<execution>
+						<id>base-compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<!-- recompile everything for target VM except the module-info.java -->
+						<configuration>
+							<excludes>
+								<exclude>module-info.java</exclude>
+							</excludes>
+						</configuration>
+					</execution>
+				</executions>
+				<configuration>
+					<source>${maven.compile.sourceLevel}</source>
+					<target>${maven.compile.targetLevel}</target>
+					<excludes>
+						<exclude>module-info.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

src/main/java/module-info.java

@@ -6,17 +6,13 @@
  * BOTTOM OF THIS PAGE. Specification: JSR-354 Money and Currency API ("Specification") Copyright
  * (c) 2012-2013, Credit Suisse All rights reserved.
  */
-module info {
+module javax.money {
     exports javax.money;
     exports javax.money.convert;
     exports javax.money.format;
     exports javax.money.spi;
-    requires java.util;
-    requires java.util.stream;
-    requires java.util.logging;
-    requires java.util.concurrent;
-    requires java.io;
-    requires java.math;
+    requires java.base;
+    requires java.logging;
     uses javax.money.spi.CurrencyProviderSpi;
     uses javax.money.spi.MonetaryAmountFactoryProviderSpi;
     uses javax.money.spi.MonetaryAmountFormatProviderSpi;