upgrade to Java 1.6.0_31

because 1.6.0_30 and earlier are now tarred with security issues, though it doesn't strictly matter in our case since the Java version we bundle doesn't get used in a browser, but nonetheless, seems like a good idea not to bundle a version with a tarnished reputation

Makefile

@@ -11,7 +11,7 @@ netlogo: resources/system/dict.txt extensions models/index.txt bin/Scripting.cla
 ### misc variables
 ifneq (,$(findstring CYGWIN,$(shell uname -s)))
     COLON = \;
-    JAVA_HOME = `cygpath -up "\Java\jdk1.6.0_26"`
+    JAVA_HOME = `cygpath -up "\Java\jdk1.6.0_31"`
 else
     COLON = :
     ifneq (,$(findstring Darwin,$(shell uname)))

bin/release.sh

@@ -33,7 +33,7 @@ SCALA=2.9.2
 SCALA_JAR=project/boot/scala-$SCALA/lib/scala-library.jar
 IJVERSION=5.0.9
 IJDIR="/Applications/install4j 5"
-VM=windows-x86-1.6.0_30_server
+VM=windows-x86-1.6.0_31_server
 
 # make sure we have proper versions of tools
 # ("brew install htmldoc"; or if you don't want to involve homebrew,

bin/sbt

@@ -2,7 +2,7 @@
 
 if [[ `uname -s` == *CYGWIN* ]] ; then
   CURR_DIR="$( cd "$( dirname "$0" )" && pwd )"
-  export JAVA_HOME=`cygpath -up "\Java\jdk1.6.0_26"`
+  export JAVA_HOME=`cygpath -up "\Java\jdk1.6.0_31"`
 else
   CURR_DIR=`dirname $0`
   if [ `uname -s` = Linux ] ; then

bin/xsbt

@@ -8,7 +8,7 @@ if [ ! -f $LAUNCH ] ; then
 fi
 
 if [ `uname -s` = Linux ] ; then
-  export JAVA_HOME=/usr/lib/jvm/java-1.6.0-sun-1.6.0.29
+  export JAVA_HOME=/usr/lib/jvm/java-1.6.0-sun-1.6.0.31
 else
   if [ `uname -s` = Darwin ] ; then
     export JAVA_HOME=`/usr/libexec/java_home -F -v1.5+`