Index: tools/ant/properties/extrapath.properties
===================================================================
--- tools/ant/properties/extrapath.properties	(revision 295035)
+++ tools/ant/properties/extrapath.properties	(working copy)
@@ -11,6 +11,7 @@
 xml-apis=${javatools.dir}/xslt4j-2_5_0/xml-apis.jar
 xalan=${javatools.dir}/xslt4j-2_5_0/xalan.jar
 javacc=${javatools.dir}/javacc.jar
+junit=${javatools.dir}/junit.jar
 
 #
 # Compile-time extras
Index: java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml	(revision 295035)
+++ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml	(working copy)
@@ -63,7 +63,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${compile.classpath};${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
       <exclude name="${this.dir}/autoGeneratedJdbc30.java"/>
Index: java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CompatibilityTest_app.properties
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CompatibilityTest_app.properties	(revision 0)
+++ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CompatibilityTest_app.properties	(revision 0)
@@ -0,0 +1 @@
+usedefaults=true
Index: java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant	(revision 295035)
+++ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant	(working copy)
@@ -1,3 +1,4 @@
+CompatibilityTest_app.properties
 aclob.txt
 autoGeneratedJdbc30_app.properties
 batchUpdate_app.properties
Index: java/testing/org/apache/derbyTesting/functionTests/master/CompatibilityTest.out
===================================================================
Index: java/testing/org/apache/derbyTesting/functionTests/util/build.xml
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/util/build.xml	(revision 295035)
+++ java/testing/org/apache/derbyTesting/functionTests/util/build.xml	(working copy)
@@ -38,7 +38,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java13compile.classpath};${junit}"/>
       </classpath>
       <include name="${this.dir}/VTIClasses/ExternalTable.java"/> 
     </javac>
@@ -55,7 +55,7 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${oro}"/>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${compile.classpath};${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/> 
       <include name="${this.dir}/StaticInitializers/*.java"/> 
Index: BUILDING.txt
===================================================================
--- BUILDING.txt	(revision 295035)
+++ BUILDING.txt	(working copy)
@@ -11,13 +11,14 @@
 2     Downloads
 2.1   Download source code
 2.2   Download required software
-2.2.1 Download and install Apache Ant 1.6.x
+2.2.1 Download and install Apache Ant 1.6.x2
 2.2.2 Download and install Java Development Kit release 1.4.x
 2.2.3 Download and install Java Development Kit release 1.3.x
 2.2.4 Download extensions for Java Development Kit release 1.3.x
-2.2.5 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
-2.2.6 Download Jikes 1.14 (Optional)
-2.2.7 Download J2ME/CDC/FOundation 1.0 and JSR169 jars (Optional)
+2.2.5 Download and install JUnit 3.8.1
+2.2.6 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.7 Download Jikes 1.14 (Optional)
+2.2.8 Download J2ME/CDC/FOundation 1.0 and JSR169 jars (Optional)
 
 3     Build instructions
 3.1   Set required environmental variables
@@ -126,7 +127,6 @@
     directory in the rest of this document. 
 
 
-
 2.2.2 Download and install Java Development Kit (JDK) release 1.4.x
 
 Skip steps 1-2 of this section if you already have JDK 1.4.x 
@@ -190,9 +190,23 @@
       ${derby.source}/tools/java
 
 
+2.2.5 Download and install JUnit 3.8.1
 
-2.2.5 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+(1) JUnit is needed for some of Derby's tests. If you intend to run
+    the Derby tests, you will need to Download a JUnit 3.8.* zip file 
+    from www.junit.org. Note that Derby has been successfully built
+    with JUnit 3.8.1 and we expect that other 3.8.* versions will work
+    with our build process. The 4.* series of JUnit releases may not work
+    until we fix the Derby build to accommodate the 1.5 extensions
+    to java.
 
+ (2) Unzip the JUnit zip file and place junit.jar from the zip file into
+     ${derby.source}/tools/java 
+
+
+2.2.6 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+
 This is an optional section.
 The reason is that osgi.jar is required to only build the 
 class org.apache.derby.osgi.EmbeddedActivator. This class 
@@ -225,7 +239,7 @@
 ${derby.source}/tools/java/osgi.jar
 
 
-2.2.6 Download and Install Jikes 1.14 (Optional)
+2.2.7 Download and Install Jikes 1.14 (Optional)
 
 This is an optional section.
 
@@ -241,7 +255,7 @@
 referred to as the ${jikes.dir} directory in the rest of this 
 document. 
 
-2.2.7 Download J2ME/CDC/Foundation and JSR 169 jars
+2.2.8 Download J2ME/CDC/Foundation and JSR 169 jars
 
 This is an optional section.