From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 10 Aug 2017 19:38:36 +0000 (+0100)
Subject: JAL-2116 test java 9 only JNLP launch
X-Git-Tag: Release_2_10_2~3^2~5^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=09d27c7eb469b41d9ef50825809ce829bc46ff26;p=jalview.git

JAL-2116 test java 9 only JNLP launch
---

diff --git a/build.xml b/build.xml
index 59d6d53..d3dd55d 100755
--- a/build.xml
+++ b/build.xml
@@ -425,8 +425,7 @@
           <offline_allowed />
         </information>
         <resources>
-          <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
-          <j2se version="9+" initial_heap_size="${inih}" max_heap_size="${maxh}"/>
+          <j2se version="9+" />
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
@@ -452,8 +451,8 @@
 
     <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 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;">
+          <replacetoken>j2se version="9+"</replacetoken>
            
         </replace>
   </target>