From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 14 Aug 2017 16:21:16 +0000 (+0100)
Subject: Merge branch 'patch/JAL-2116_java9' into develop
X-Git-Tag: Release_2_10_2~3^2~4^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=da2e1e7c599761591e7c144441d9c93975be844f;hp=5ae23fd6e3c36ad7e735b514b6caf901be996c5e;p=jalview.git

Merge branch 'patch/JAL-2116_java9' into develop
---

diff --git a/build.xml b/build.xml
index 2eafce5..6ed340d 100755
--- a/build.xml
+++ b/build.xml
@@ -426,6 +426,7 @@
         </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" />