From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 6 Oct 2017 16:01:38 +0000 (+0100)
Subject: JAL-2116 fix jnlp file post-processing so java 9 module path and java version added... 
X-Git-Tag: Release_2_10_3b1~118^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b122409392a4d67ac76c7866782a0e2a041941c4;p=jalview.git

JAL-2116 fix jnlp file post-processing so java 9 module path and java version added correctly
---

diff --git a/build.xml b/build.xml
index eb30ef0..f39fdf3 100755
--- a/build.xml
+++ b/build.xml
@@ -425,7 +425,7 @@
           <offline_allowed />
         </information>
         <resources>
-          <j2se version="9+" />
+          <j2se version="1.7+" />
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
@@ -450,9 +450,9 @@
     </presetdef>
 
     <jnlpf toFile="${jnlpFile}" />
-    <!-- add a j2se entry for java 9 -->
+    <!-- add the add-modules j2se attribute for java 9 -->
     <replace file="${jnlpFile}" value="j2se version=&quot;1.7+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee&quot;">
-          <replacetoken>j2se version="1.9+"</replacetoken>
+          <replacetoken>j2se version="1.7+"</replacetoken>
            
         </replace>
   </target>