248038 experiment on branch -- We should move to Java 6 to run JUnit tests

releng.wtpbuilder/distribution/wtp.tests/build.xml

diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 26f74d4..e2af86c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -167,7 +167,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <property
             name="plugin-path"
             value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
@@ -212,7 +212,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
+            jvm="${env.JAVA_6_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset

releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml

diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index f9f4ff0..ff81fb3 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -74,7 +74,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>