From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 27 Oct 2017 09:52:05 +0000 (+0100)
Subject: JAL-2754 update to specify Java 1.8(+)
X-Git-Tag: Release_2_10_4~40^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4d1942fa0930edb10e9dff403b252463e898329a;p=jalview.git

JAL-2754 update to specify Java 1.8(+)
---

diff --git a/build.xml b/build.xml
index 7303674..2333ea3 100755
--- a/build.xml
+++ b/build.xml
@@ -112,8 +112,8 @@
     <!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
     <property name="j2sev" value="1.7+" />
     <!-- Java Compilation settings - source and target javac version -->
-    <property name="javac.source" value="1.7" />
-    <property name="javac.target" value="1.7" />
+    <property name="javac.source" value="1.8" />
+    <property name="javac.target" value="1.8" />
 
     <!-- Permissions for running Java applets and applications. -->
     <!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
@@ -433,7 +433,7 @@
           <offline_allowed />
         </information>
         <resources>
-          <j2se version="1.7+" />
+          <j2se version="1.8+" />
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
@@ -460,8 +460,8 @@
 
     <jnlpf toFile="${jnlpFile}" />
     <!-- 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 --illegal-access=warn&quot;">
-          <replacetoken>j2se version="1.7+"</replacetoken>
+    <replace file="${jnlpFile}" value="j2se version=&quot;1.8+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee --illegal-access=warn&quot;">
+          <replacetoken>j2se version="1.8+"</replacetoken>
            
         </replace>
   </target>