From 49f82efd7c31b8697c74cae3ee2c4d0c246a5e97 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Thu, 18 Dec 2008 19:58:24 +0000
Subject: [PATCH] revert move to Java 6 for now
---
releng.wtpbuilder/distribution/wtp.tests/build.xml | 4 ++--
.../distribution/wtp.tests/testScripts/wtp-junit-tests.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index e2af86c0d..26f74d4b9 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_6_HOME}/bin/java"/>
+ value="${env.JAVA_5_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_6_HOME}/bin/java"
+ jvm="${env.JAVA_5_HOME}/bin/java"
classname="org.eclipse.equinox.launcher.Main">
<classpath>
<fileset
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 ff81fb362..f9f4ff06c 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_6_HOME}/bin/java"/>
+ value="${env.JAVA_5_HOME}/bin/java"/>
<dirname
file="${ant.file}"
property="currentDir"/>
--
GitLab