Skip to content
Snippets Groups Projects
Commit 49f82efd authored by david_williams's avatar david_williams
Browse files

revert move to Java 6 for now

parent 91bd660f
No related branches found
No related tags found
No related merge requests found
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
description="Run our JUnit's within an instance of antRunner"> description="Run our JUnit's within an instance of antRunner">
<property <property
name="test-vm" name="test-vm"
value="${env.JAVA_6_HOME}/bin/java"/> value="${env.JAVA_5_HOME}/bin/java"/>
<property <property
name="plugin-path" name="plugin-path"
value="${testRoot}${dropinsFolder}/eclipse/plugins"/> value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
failonerror="false" failonerror="false"
timeout="${testTimeLimit}" timeout="${testTimeLimit}"
dir="${testRoot}/eclipse" dir="${testRoot}/eclipse"
jvm="${env.JAVA_6_HOME}/bin/java" jvm="${env.JAVA_5_HOME}/bin/java"
classname="org.eclipse.equinox.launcher.Main"> classname="org.eclipse.equinox.launcher.Main">
<classpath> <classpath>
<fileset <fileset
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
value="${junit-report-output}/raw/${classname}.xml"/> value="${junit-report-output}/raw/${classname}.xml"/>
<property <property
name="jvm" name="jvm"
value="${env.JAVA_6_HOME}/bin/java"/> value="${env.JAVA_5_HOME}/bin/java"/>
<dirname <dirname
file="${ant.file}" file="${ant.file}"
property="currentDir"/> property="currentDir"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment