248038 We should move to Java 6 to run JUnit tests

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

@@ -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"/>
@@ -122,7 +122,7 @@
             message="buildLabel: ${buildLabel}"/>
         <echo
             level="debug"
-            message="jvm: ${env.JAVA_5_HOME}/bin/java"/>
+            message="jvm: ${jvm}"/>
     </target>
     <target
         name="core-test"
@@ -188,7 +188,7 @@
             failonerror="false"
             timeout="${timeout}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
+            jvm="${jvm}"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset

releng.wtpbuilder/distribution/xml.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/xml.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"/>
@@ -122,7 +122,7 @@
             message="buildLabel: ${buildLabel}"/>
         <echo
             level="debug"
-            message="jvm: ${env.JAVA_5_HOME}/bin/java"/>
+            message="jvm: ${jvm}"/>
     </target>
     <target
         name="core-test"
@@ -188,7 +188,7 @@
             failonerror="false"
             timeout="${timeout}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
+            jvm="${jvm}"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset