This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Removed module dependency to ant and relaxngDatatype, those can now b…

…e placed on classpath instead.

Signed-off-by: Roman Grigoriadi <roman.grigoriadi@oracle.com>
  • Loading branch information...
bravehorsie committed Dec 5, 2017
1 parent 75dcd55 commit 10697ac4971b6294bdafb7dbba5f5dac3d74a795
@@ -99,5 +99,56 @@
</dependency>
</dependencies>
<profiles>
<profile>
<id>jdk9-setup</id>
<activation>
<jdk>9</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<jdkToolchain>
<version>9</version>
</jdkToolchain>
<source>9</source>
<target>9</target>
<includes>
<include>module-info.java</include>
</includes>
<compilerArgs>
<arg>--add-reads</arg>
<arg>com.sun.tools.rngom=relaxngDatatype</arg>
</compilerArgs>
</configuration>
</execution>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>1.7</source>
<target>1.7</target>
<jdkToolchain>
<version>1.7</version>
</jdkToolchain>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
@@ -44,7 +44,6 @@
module com.sun.tools.rngom {
requires java.xml;
requires relaxngDatatype;
requires java.logging;
exports org.kohsuke.rngom.parse;
View
@@ -256,8 +256,6 @@
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<argLine>
--add-reads java.base=java.desktop
--add-modules java.xml.bind
--upgrade-module-path ${endorsed.dir}
-Djdk.attach.allowAttachSelf
</argLine>
View
@@ -275,6 +275,10 @@
<includes>
<include>module-info.java</include>
</includes>
<compilerArgs>
<arg>--add-reads</arg>
<arg>com.sun.tools.xjc=antX</arg>
</compilerArgs>
</configuration>
</execution>
<execution>
@@ -57,6 +57,5 @@
requires com.sun.tools.rngom;
requires com.sun.xml.dtdparser;
requires com.sun.xml.txw2;
requires ant;
}
View
@@ -205,6 +205,10 @@
<includes>
<include>module-info.java</include>
</includes>
<compilerArgs>
<arg>--add-reads</arg>
<arg>com.sun.tools.rngom=relaxngDatatype</arg>
</compilerArgs>
</configuration>
</execution>
<execution>
@@ -48,7 +48,6 @@
requires java.xml;
requires java.desktop;
requires relaxngDatatype;
requires java.logging;
exports com.sun.xml.xsom;

0 comments on commit 10697ac

Please sign in to comment.