JAL-3130 Lots of deprecation fixes. See utils/deprecation_auto_fixes.sh for commands...

[jalview.git] / build-j11.xml

diff --git a/build-j11.xml b/build-j11.xml
index 71fee4f..d56d029 100755 (executable)
--- a/build-j11.xml
+++ b/build-j11.xml
@@ -44,6 +44,7 @@
     <echo message="note: compile and makeApplet optionally compile/obfuscate applet against a different Java version by specifying -Djava118.home=PathtoJDK/lib which is the lib directory in the JDK install that contains rt.jar " />
     <echo message="Useful -D flags: -Ddonotobfuscate will prevent applet obfuscation" />
     <echo message="Useful -D flags: -Dclover.jar to specify path to openclover for testng coverage report" />
+    <echo message="Useful -D flags: -Ddeprecation=true to add -Xlint:deprecation to the java compiler" />
   </target>
 
 
@@ -326,7 +327,11 @@
   <taskdef resource="testngtasks" classpath="utils/testnglibs/testng.jar" />
 
   <target name="testng" depends="buildTests">
-    <loadfile property="j11modules" srcFile="modules"/>
+    <loadfile property="j11modules" srcFile="modules">
+      <filterchain>
+        <striplinebreaks/>
+      </filterchain>
+    </loadfile>
     <echo message="j11libDir is '${j11libDir}'" />
     <echo message="j11modules is '${j11modules}'" />
     <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng"
@@ -336,7 +341,10 @@
         <pathelement location="${clover.jar}" if:set="clover.jar"/>
         <path refid="test.classpath" />
       </classpath>
-      <jvmarg value="--module-path=${j11libDir}:${java.home}/jmods" if:set="java11"/>
+      <!--
+      <jvmarg value="DASH_DASH_module-path=${j11libDir}:${java.home}/jmods" if:set="java11"/>
+      -->
+      <jvmarg value="--module-path=${j11libDir}" if:set="java11"/>
       <jvmarg value="--add-modules=${j11modules}" if:set="java11"/>
       <jvmarg value="--add-modules=java.se.ee" if:set="java9"/>
       <jvmarg value="--illegal-access=warn" if:set="java9"/>