discontinue java.ext.dirs for jdk-11 -- in contrast to 982f0bf34804 f…

…or jdk-8;
Xaphiosis · Oct 5, 2018 · fbfebb5 · fbfebb5
1 parent 708adf5
commit fbfebb5
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 7 deletions.
diff --git a/Admin/Linux/Isabelle.run b/Admin/Linux/Isabelle.run
@@ -30,7 +30,6 @@ unset XMODIFIERS
 
 exec "$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/bin/java" \
   "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
-  "-Djava.ext.dirs=$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/lib/ext" \
   -classpath "{CLASSPATH}" \
   "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
   isabelle.Main "$@"
diff --git a/Admin/MacOS/Info.plist-part2 b/Admin/MacOS/Info.plist-part2
@@ -1,5 +1,4 @@
 <string>-Disabelle.root=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}</string>
-<string>-Djava.ext.dirs=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}/contrib/jdk/x86_64-darwin/Contents/Home/jre/lib/ext</string>
 <string>-Disabelle.app=true</string>
 </array>
 <key>JVMArguments</key>

diff --git a/Admin/Windows/launch4j/isabelle.xml b/Admin/Windows/launch4j/isabelle.xml
@@ -30,7 +30,7 @@
     <maxVersion></maxVersion>
     <jdkPreference>jdkOnly</jdkPreference>
     <runtimeBits>64</runtimeBits>
-    <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Djava.ext.dirs=&quot;%EXEDIR%\contrib\jdk\x86_64-windows\jre\lib\ext&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
+    <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
   </jre>
   <splash>
     <file>{SPLASH}</file>

diff --git a/bin/isabelle_java b/bin/isabelle_java
@@ -67,7 +67,6 @@ export ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
     unset ISABELLE_HOME
     unset CLASSPATH
     exec "$JAVA_HOME/bin/java" "${JAVA_ARGS[@]}" \
-      "-Djava.ext.dirs=$JAVA_HOME/lib/ext" \
       -classpath "$ISABELLE_CLASSPATH" "$@"
   fi
 }
diff --git a/lib/Tools/java b/lib/Tools/java
@@ -10,5 +10,4 @@ eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
 unset CLASSPATH
 
 isabelle_java java "${JAVA_ARGS[@]}" \
-  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
diff --git a/lib/Tools/scala b/lib/Tools/scala
@@ -14,5 +14,4 @@ do
 done
 
 isabelle_scala scala "${SCALA_ARGS[@]}" \
-  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
diff --git a/lib/Tools/scalac b/lib/Tools/scalac
@@ -7,5 +7,4 @@
 isabelle_admin_build jars || exit $?
 
 isabelle_scala scalac -Dfile.encoding=UTF-8 \
-  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"