sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1803064 - in /sis/branches/JDK9: application/pom.xml ide-project/NetBeans/nbproject/project.properties pom.xml
Date Wed, 26 Jul 2017 15:36:53 GMT
Author: desruisseaux
Date: Wed Jul 26 15:36:53 2017
New Revision: 1803064

URL: http://svn.apache.org/viewvc?rev=1803064&view=rev
Log:
Allow the project to compile as automatic modules.

Modified:
    sis/branches/JDK9/application/pom.xml
    sis/branches/JDK9/ide-project/NetBeans/nbproject/project.properties
    sis/branches/JDK9/pom.xml

Modified: sis/branches/JDK9/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK9/application/pom.xml?rev=1803064&r1=1803063&r2=1803064&view=diff
==============================================================================
--- sis/branches/JDK9/application/pom.xml (original)
+++ sis/branches/JDK9/application/pom.xml Wed Jul 26 15:36:53 2017
@@ -114,7 +114,7 @@
            Sub-modules included in the build in dependency order
        =========================================================== -->
   <modules>
-    <module>sis-webapp</module>
+<!--<module>sis-webapp</module>         Omitted until maven-war-plugin is
made compatible with JDK9. -->
     <module>sis-console</module>
 <!--<module>sis-openoffice</module>     Omitted for now because of the numerous
warnings emitted by Pack200. -->
   </modules>

Modified: sis/branches/JDK9/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK9/ide-project/NetBeans/nbproject/project.properties?rev=1803064&r1=1803063&r2=1803064&view=diff
==============================================================================
--- sis/branches/JDK9/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK9/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Wed Jul
26 15:36:53 2017
@@ -125,6 +125,7 @@ javac.classpath=\
     ${maven.repository}/edu/ucar/cdm/${netcdf.version}/cdm-${netcdf.version}.jar:\
     ${maven.repository}/org/osgi/org.osgi.core/${osgi.version}/org.osgi.core-${osgi.version}.jar:\
     ${maven.repository}/com/googlecode/jaxb-namespaceprefixmapper-interfaces/JAXBNamespacePrefixMapper/${jaxb-ns-mapper}/JAXBNamespacePrefixMapper-${jaxb-ns-mapper}.jar
+javac.modulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.test.classpath=\
@@ -136,11 +137,15 @@ javac.test.classpath=\
     ${build.classes.dir}
 javac.test.processorpath=\
     ${javac.test.classpath}
+javac.processormodulepath=\
+    ${javac.modulepath}
 javac.test.modulepath=\
     ${javac.modulepath}
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}:\
@@ -155,20 +160,14 @@ run.test.classpath=\
     ${maven.repository}/org/apache/httpcomponents/httpclient/${httpclient.version}/httpclient-${httpclient.version}.jar:\
     ${maven.repository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar:\
     ${maven.repository}/org/slf4j/slf4j-jdk14/${slf4j.version}/slf4j-jdk14-${slf4j.version}.jar
-
-javac.modulepath=
-javac.processormodulepath=\
-    ${javac.modulepath}
-run.modulepath=\
-    ${javac.modulepath}
 run.test.modulepath=\
     ${javac.test.modulepath}
 debug.classpath=\
     ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
 debug.modulepath=\
     ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
 debug.test.modulepath=\
     ${run.test.modulepath}
 

Modified: sis/branches/JDK9/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK9/pom.xml?rev=1803064&r1=1803063&r2=1803064&view=diff
==============================================================================
--- sis/branches/JDK9/pom.xml (original)
+++ sis/branches/JDK9/pom.xml Wed Jul 26 15:36:53 2017
@@ -548,7 +548,7 @@ Apache SIS is a free software, Java lang
       <!-- Compile -->
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2-SNAPSHOT</version>
         <configuration>
           <source>${maven.compile.source}</source>
           <target>${maven.compile.target}</target>
@@ -557,6 +557,7 @@ Apache SIS is a free software, Java lang
           <compilerArgs>
             <arg>-Xlint:all</arg>
             <arg>-Xdoclint:syntax,html,missing/protected,accessibility/protected</arg>
+            <arg>--add-modules</arg> <arg>java.xml.bind,java.xml.ws.annotation</arg>
           </compilerArgs>
         </configuration>
       </plugin>



Mime
View raw message