1.1 --- a/Admin/java/README	Wed Apr 25 14:19:53 2012 +0200
     1.2 +++ b/Admin/java/README	Wed Apr 25 14:24:27 2012 +0200
     1.3 @@ -1,3 +1,3 @@
     1.4 -This is JDK 1.7.0_03 for Linux from
     1.5 +This is JDK 1.6.0_31 for Linux from
     1.6  http://www.oracle.com/technetwork/java/javase/downloads/index.html
     1.7  

     2.1 --- a/Admin/java/etc/settings	Wed Apr 25 14:19:53 2012 +0200
     2.2 +++ b/Admin/java/etc/settings	Wed Apr 25 14:24:27 2012 +0200
     2.3 @@ -1,4 +1,4 @@
     2.4  # -*- shell-script -*- :mode=shellscript:
     2.5  
     2.6 -ISABELLE_JDK_HOME="$COMPONENT/jdk1.7.0_03"
     2.7 +ISABELLE_JDK_HOME="$COMPONENT/jdk1.6.0_31"
     2.8  

     3.1 --- a/Admin/launch4j/isabelle.xml	Wed Apr 25 14:19:53 2012 +0200
     3.2 +++ b/Admin/launch4j/isabelle.xml	Wed Apr 25 14:24:27 2012 +0200
     3.3 @@ -20,7 +20,7 @@
     3.4      <cp>lib\classes\ext\scala-swing.jar</cp>
     3.5    </classPath>
     3.6    <jre>
     3.7 -    <path>contrib\jdk-7u3_x86-cygwin\jdk1.7.0_03</path>
     3.8 +    <path>contrib\jdk-6u31_x86-cygwin\jdk1.6.0_31</path>
     3.9      <minVersion></minVersion>
    3.10      <maxVersion></maxVersion>
    3.11      <jdkPreference>jdkOnly</jdkPreference>

     4.1 --- a/README	Wed Apr 25 14:19:53 2012 +0200
     4.2 +++ b/README	Wed Apr 25 14:24:27 2012 +0200
     4.3 @@ -16,7 +16,7 @@
     4.4       * The Poly/ML compiler and runtime system (version 5.2.1 or later).
     4.5       * The GNU bash shell (version 3.x or 2.x).
     4.6       * Perl (version 5.x).
     4.7 -     * Java 1.6.x or 1.7.x from Oracle or Apple -- for Scala and jEdit.
     4.8 +     * Java 1.6.x from Oracle or Apple -- for Scala and jEdit.
     4.9       * GNU Emacs (version 23 or 24) -- for the Proof General 4.x interface.
    4.10       * A complete LaTeX installation -- for document preparation.
    4.11  

     5.1 --- a/src/HOL/Tools/Nitpick/nitpick.ML	Wed Apr 25 14:19:53 2012 +0200
     5.2 +++ b/src/HOL/Tools/Nitpick/nitpick.ML	Wed Apr 25 14:24:27 2012 +0200
     5.3 @@ -180,7 +180,7 @@
     5.4                 (length ts downto 1) ts))]
     5.5  
     5.6  fun install_java_message () =
     5.7 -  "Nitpick requires Java Development Kit 1.6/1.7 via ISABELLE_JDK_HOME setting."
     5.8 +  "Nitpick requires Java Development Kit 1.6 via ISABELLE_JDK_HOME setting."
     5.9  fun install_kodkodi_message () =
    5.10    "Nitpick requires the external Java program Kodkodi. To install it, download \
    5.11    \the package from \"http://www21.in.tum.de/~blanchet/#software\" and add the \

     6.1 --- a/src/Tools/jEdit/README_BUILD	Wed Apr 25 14:19:53 2012 +0200
     6.2 +++ b/src/Tools/jEdit/README_BUILD	Wed Apr 25 14:24:27 2012 +0200
     6.3 @@ -1,10 +1,10 @@
     6.4  Requirements for instantaneous build from sources
     6.5  =================================================
     6.6  
     6.7 -* Official Java JDK 1.6/1.7 from Sun/Oracle/Apple
     6.8 +* Official Java JDK 1.6 from Sun/Oracle/Apple
     6.9    http://www.oracle.com/technetwork/java/javase/downloads/index.html
    6.10  
    6.11 -  (or OpenJDK 1.7, but not OpenJDK 1.6)
    6.12 +  (experimental support for JDK/OpenJDK 1.7, but not OpenJDK 1.6)
    6.13  
    6.14  * Scala 2.9.2 (or 2.8.2.final)
    6.15    http://www.scala-lang.org