merged

--- a/Admin/components/components.sha1	Fri Apr 20 07:36:59 2018 +0000
+++ b/Admin/components/components.sha1	Fri Apr 20 15:58:02 2018 +0200
@@ -177,6 +177,7 @@
 a619177143fea42a464f49bb864665407c07a16c  polyml-test-fb4f42af00fa.tar.gz
 53123dc011b2d4b4e8fe307f3c9fa355718ad01a  postgresql-42.1.1.tar.gz
 3a5d31377ec07a5069957f5477a4848cfc89a594  postgresql-42.1.4.tar.gz
+e7cd5c7955e9eb5ce8cd07feb97230b23d2eec40  postgresql-42.2.2.tar.gz
 f132329ca1045858ef456cc08b197c9eeea6881b  postgresql-9.4.1212.tar.gz
 8ee375cfc38972f080dbc78f07b68dac03efe968  ProofGeneral-3.7.1.1.tar.gz
 847b52c0676b5eb0fbf0476f64fc08c2d72afd0c  ProofGeneral-4.1.tar.gz

--- a/Admin/components/main	Fri Apr 20 07:36:59 2018 +0000
+++ b/Admin/components/main	Fri Apr 20 15:58:02 2018 +0200
@@ -12,7 +12,7 @@
 kodkodi-1.5.2
 nunchaku-0.5
 polyml-5.7.1-5
-postgresql-42.1.4
+postgresql-42.2.2
 scala-2.12.5
 smbc-0.4.1
 ssh-java-20161009

--- a/lib/browser/build	Fri Apr 20 07:36:59 2018 +0000
+++ b/lib/browser/build	Fri Apr 20 15:58:02 2018 +0200
@@ -63,7 +63,7 @@
 
   rm -rf classes && mkdir classes
 
-  isabelle_jdk javac -d classes -source 1.4 "${SOURCES[@]}" || \
+  isabelle_jdk javac -d classes -source 1.6 "${SOURCES[@]}" || \
     fail "Failed to compile sources"
   isabelle_jdk jar cf "$(platform_path "$TARGET")" -C classes . ||
     fail "Failed to produce $TARGET"

--- a/lib/scripts/getsettings	Fri Apr 20 07:36:59 2018 +0000
+++ b/lib/scripts/getsettings	Fri Apr 20 15:58:02 2018 +0200
@@ -102,7 +102,12 @@
 ISABELLE_OUTPUT="$ISABELLE_OUTPUT/$ML_IDENTIFIER"
 
 #enforce JAVA_HOME
-export JAVA_HOME="$ISABELLE_JDK_HOME/jre"
+if [ -d "$ISABELLE_JDK_HOME/jre" ]
+then
+  export JAVA_HOME="$ISABELLE_JDK_HOME/jre"
+else
+  export JAVA_HOME="$ISABELLE_JDK_HOME"
+fi
 
 set +o allexport
 

--- a/src/Pure/Admin/ci_profile.scala	Fri Apr 20 07:36:59 2018 +0000
+++ b/src/Pure/Admin/ci_profile.scala	Fri Apr 20 15:58:02 2018 +0200
@@ -9,7 +9,7 @@
 
 import java.time.{Instant, ZoneId}
 import java.time.format.DateTimeFormatter
-import java.util.{Properties => JProperties}
+import java.util.{Properties => JProperties, Map => JMap}
 
 
 abstract class CI_Profile extends Isabelle_Tool.Body
@@ -88,7 +88,7 @@
     print_section("CONFIGURATION")
     println(Build_Log.Settings.show())
     val props = load_properties()
-    System.getProperties().putAll(props)
+    System.getProperties().asInstanceOf[JMap[AnyRef, AnyRef]].putAll(props)
 
     val options =
       with_documents(Options.init())