From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 4 Sep 2017 12:32:16 +0000 (+0100)
Subject: Merge branch 'documentation/JAL-2675_release2102b1' into releases/Release_2_10_2b1_Branch
X-Git-Tag: Release_2_10_2b1~11^2~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6948fb19a006d5d5741557b4c5c4efd02655913e;hp=4d97213fb407d2f6b65f73edcfe3fe3017d1d772;p=jalview.git

Merge branch 'documentation/JAL-2675_release2102b1' into releases/Release_2_10_2b1_Branch
---

diff --git a/build.xml b/build.xml
index 9e21593..eb30ef0 100755
--- a/build.xml
+++ b/build.xml
@@ -451,8 +451,8 @@
 
     <jnlpf toFile="${jnlpFile}" />
     <!-- add a j2se entry for java 9 -->
-    <replace file="${jnlpFile}" value="j2se version=&quot;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="9+"</replacetoken>
+    <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>
            
         </replace>
   </target>