DrJavaAtRice
diff --git a/‎drjava/build.xml‎
Lines changed: 12 additions & 7 deletions b/‎drjava/build.xml‎
Lines changed: 12 additions & 7 deletions
diff --git a/‎drjava/lib/ecj-4.9.jar‎
-1.54 MB b/‎drjava/lib/ecj-4.9.jar‎
-1.54 MB
diff --git a/‎drjava/lib/forms-1.2.1.jar‎
-103 KB b/‎drjava/lib/forms-1.2.1.jar‎
-103 KB
diff --git a/‎drjava/lib/jgoodies-common-1.8.1.jar‎
36.9 KB b/‎drjava/lib/jgoodies-common-1.8.1.jar‎
36.9 KB
diff --git a/‎drjava/lib/jgoodies-common.jar‎
-30.7 KB b/‎drjava/lib/jgoodies-common.jar‎
-30.7 KB
diff --git a/‎drjava/lib/jgoodies-forms-1.9.0.jar‎
132 KB b/‎drjava/lib/jgoodies-forms-1.9.0.jar‎
132 KB
diff --git a/‎drjava/lib/jgoodies-looks-2.7.0.jar‎
391 KB b/‎drjava/lib/jgoodies-looks-2.7.0.jar‎
391 KB
diff --git a/‎drjava/lib/jgoodies-looks.jar‎
-383 KB b/‎drjava/lib/jgoodies-looks.jar‎
-383 KB
diff --git a/‎drjava/lib/platform.jar‎
-2.73 KB b/‎drjava/lib/platform.jar‎
-2.73 KB
diff --git a/‎drjava/lib/readme.txt‎
Lines changed: 7 additions & 5 deletions b/‎drjava/lib/readme.txt‎
Lines changed: 7 additions & 5 deletions
@@ -43,6 +43,7 @@
   <property name="java7-home" value="${env.JAVA7_HOME}" />
   <property name="java6-home" value="${env.JAVA6_HOME}" />
   <property name="java5-home" value="${env.JAVA5_HOME}" />
+  <echo message = "java.home = ${java.home}" />
   <property name="launch4j-home" value="${env.LAUNCH4J_HOME}" />
   <property name="clover-jar" value="${env.CLOVER_JAR}" />
   <property name="findbugs-home" value="${env.FINDBUGS_HOME}" />
@@ -69,7 +70,9 @@
 <!--  <extendclasspath path="lib/buildlib/junit.jar" /> -->
 
   <fileset id="libs" dir="lib" includes="*.jar" /> <!-- Only include jars that are at the top level (not in buildlib) -->
-  
+  <fileset id="jrelibs" dir="${java.home}/lib" includes="*.jar" /> 
+  <echo message="jrelibs = ${jrelibs}" />
+  <fileset id="extlibs" dir="${java.home}/lib/ext" includes="*.jar" /> 
   <!-- Use ConcJUnit if use-concjunit is not defined and we are not running Java 7. -->
   <!-- ConcJUnit is currently incompatible with Java 7. -->
   <if>
@@ -213,7 +216,7 @@
        Compilation Targets
        ******************* -->
 
-  <!-- The following target assumes that javac resolves a Java 7 compiler -->
+  <!-- The following target assumes that javac resolves a Java 8 compiler -->
   <target name="compile" depends="generate-source, do-compile, copy-resources, unjar-libs"
           description="Compile all source files (after generating the source)">
   </target>
@@ -231,17 +234,19 @@
     </move>
 
     <javac srcdir="src" destdir="classes/base" source="1.6" target="1.6"
-           bootclasspath="${java7-runtime}" sourcepath="" includeAntRuntime="no"
-           executable="javac" fork="yes" memoryMaximumSize="1024M"
-           debug="on" optimize="off" deprecation="on"	>
+           bootclasspath="${java8-runtime}" sourcepath="" includeAntRuntime="no"
+           executable="${java8-home}/bin/javac" fork="yes" memoryMaximumSize="1024M"
+           debug="on" optimize="off" deprecation="on" >
       <classpath>
         <!-- TODO: Remove this dependency on tools.jar by refactoring and moving all the dependent
              debugger code into the "platform" module -->
-        <pathelement location="${java7-tools}" />
+        <pathelement location="${java8-tools}" />
         <fileset refid="libs" />
+	<fileset refid="jrelibs" />
+        <fileset refid="extlibs" />
         <pathelement location="lib/buildlib/junit.jar" />
         <pathelement location="lib/buildlib/netbeans-memory-leak-utils.jar" />
-        <pathelement location="classes/base" />
+<!--    <pathelement location="classes/base" />  THIS directory is typically empty at the start of this step -->
       </classpath>
       <compilerarg value="-Xlint" />
       <!-- Ignore serial warnings, because they occur for every Throwable definition (among others) -->
 
@@ -5,18 +5,20 @@ buildlib/*.jar: Binaries used in the build process, but that should not be part
 
 VERSIONS:
 
-asm-3.1.jar:              ASM 3.1 (http://asm.objectweb.org)
+asm-all-5.0.1.jar:        ASM 5.0 (http://asm.objectweb.org)
 docs.jar:                 docs-20060901-2010
 dynamicjava-base.jar:     dynamicjava-20090813-r4987
-forms-1.2.1.jar:          JGoodies Forms
+jgoodies-common-1.8.1.jar JGoodies Forms and Looks for Java 6 (later versions not yet available for distribution)
+jgoodies-forms-1.9.0.jar
+jgoodies-looks-2.7.0.jar
 javalanglevels-base.jar:  javalanglevels-20090223-r4766
-junit.jar:                JUnit 4.4
-looks-2.2.2.jar:          JGoodies Looks
+junit.jar:                JUnit 3.8.2 or Concutest based on JUnit 3.8.2
 platform.jar:             platform-20090812-r4985
 plt.jar:                  plt-20090812-r4961
+tools.jar: 		  from openjdk-8 as built by azul systems
 
 buildlib/ant-contrib.jar:           ANT Contrib 1.0b3
 buildlib/cenquatasks.jar:           Distributed with Clover 1.3.9
 buildlib/findbugs-ant.jar:          FindBugs 1.3.1
-buildlib/junit.jar:                 JUnit 3.8.1
+buildlib/junit.jar:                 JUnit 3.8.2
 buildlib/plt-ant.jar:               plt-ant-20070212-2001