From 36279e05d511b7f2eacc4a3e883ce9f4c75c8bcf Mon Sep 17 00:00:00 2001
From: Ben Soares <bsoares@dundee.ac.uk>
Date: Mon, 10 Dec 2018 11:01:49 +0000
Subject: [PATCH] JAL-3130 tweaked build.xml to do java 11 bytecode
 compiling[git branchgit branch]. updated getJavaVersion and
 added showJDKVersion in utils.

---
 build.xml                 |   10 +++++++---
 utils/getJavaVersion.java |    5 ++++-
 utils/showJVMVersion.java |    5 +++++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 utils/showJVMVersion.java

diff --git a/build.xml b/build.xml
index 8eeaf7f..ba88f9a 100755
--- a/build.xml
+++ b/build.xml
@@ -114,7 +114,7 @@
     <condition property="java11">
       <equals arg1="${ant.java.version}" arg2="11"/>
     </condition>
-    <echo message="java version is ${ant.java.version}"/>
+    <echo message="ant.java.version is ${ant.java.version}"/>
 
     <!-- Don't change anything below here unless you know what you are doing! -->
     <!-- Url path for WebStart in JNLP file -->
@@ -125,8 +125,12 @@
     <!-- 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.8" />
-    <property name="javac.target" value="1.8" />
+    <property name="javac.source" value="11" if:set="java11" />
+    <property name="javac.target" value="11" if:set="java11" />
+    <property name="javac.source" value="1.8" unless:set="java11" />
+    <property name="javac.target" value="1.8" unless:set="java11" />
+    <echo message="javac.source is ${javac.source}"/>
+    <echo message="javac.target is ${javac.target}"/>
 
     <!-- Permissions for running Java applets and applications. -->
     <!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
diff --git a/utils/getJavaVersion.java b/utils/getJavaVersion.java
index 8496f8b..8e09423 100644
--- a/utils/getJavaVersion.java
+++ b/utils/getJavaVersion.java
@@ -139,7 +139,7 @@ public class getJavaVersion
     if (versions == null)
     {
       versions = new Hashtable();
-      versions.put("45.3", "1.0");
+      versions.put("45.3", "1.0.2");
       versions.put("45.3", "1.1");
       versions.put("46.0", "1.2");
       versions.put("47.0", "1.3");
@@ -148,6 +148,9 @@ public class getJavaVersion
       versions.put("50.0", "1.6");
       versions.put("51.0", "1.7");
       versions.put("52.0", "1.8");
+      versions.put("53.0", "9");
+      versions.put("54.0", "10");
+      versions.put("55.0", "11");
 
     }
     String version = (String) versions.get(major + "." + minor);
diff --git a/utils/showJVMVersion.java b/utils/showJVMVersion.java
new file mode 100644
index 0000000..671abc4
--- /dev/null
+++ b/utils/showJVMVersion.java
@@ -0,0 +1,5 @@
+public class showJVMVersion {
+ public static void main(String args[]) {
+   System.out.println(System.getProperty("java.version"));
+ }
+}
-- 
1.7.10.2