From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 10 Aug 2017 15:37:30 +0000 (+0100)
Subject: JAL-2116 explicit replace j2se element with a java9 specific one since orangevolt... 
X-Git-Tag: Release_2_10_2~3^2~5^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e8ff6cb190553d2797433022ca45dd2e05d8b8c4;p=jalview.git

JAL-2116 explicit replace j2se element with a java9 specific one since orangevolt-tasks don't support the java-vm-args attribute
---

diff --git a/build.xml b/build.xml
index c965bc9..59d6d53 100755
--- a/build.xml
+++ b/build.xml
@@ -426,7 +426,7 @@
         </information>
         <resources>
           <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
-          <j2se version="9+" initial_heap_size="${inih}" max_heap_size="${maxh}" java-vm-args="--add-modules java.rmi,java.xml,java.xml.bind,java.xml.ws"/>
+          <j2se version="9+" initial_heap_size="${inih}" max_heap_size="${maxh}"/>
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
@@ -451,7 +451,11 @@
     </presetdef>
 
     <jnlpf toFile="${jnlpFile}" />
-
+    <!-- add a j2se entry for java 9 -->
+    <replace file="${jnlpFile}" value="j2se version=&quot;9+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules java.rmi,java.xml,java.xml.bind,java.xml.ws&quot;/&gt;&lt;j2se">
+          <replacetoken>j2se</replacetoken>
+           
+        </replace>
   </target>
 
   <target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">