From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 17 Aug 2017 10:41:33 +0000 (+0100)
Subject: JAL-2418 JAL-2116 make sure java 8,7 vm args are also listed
X-Git-Tag: Release_2_10_2~1^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cfad04fa258c4b5fb92010449626d231603975bb;p=jalview.git

JAL-2418 JAL-2116 make sure java 8,7 vm args are also listed
---

diff --git a/build.xml b/build.xml
index 94f32fd..2ab4bec 100755
--- a/build.xml
+++ b/build.xml
@@ -426,7 +426,6 @@
         </information>
         <resources>
           <j2se version="9+" />
-          <j2se version="7,8" initial_heap_size="${inih}" max_heap_size="${maxh}" />
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
@@ -452,7 +451,7 @@
 
     <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.se.ee&quot;">
+    <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.se.ee&quot;/&gt;&lt;j2se version=&quot;7,8&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot;">
           <replacetoken>j2se version="9+"</replacetoken>
            
         </replace>