diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index b56852e4bf71c0aeda58e2ca5cbe46e399232eb1..e65ac18dd14f137e220bbd0dcb717bcd9112d52b 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -194,9 +194,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -232,9 +230,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -281,9 +277,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -319,9 +313,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildId"
value="3.3.0"/>
@@ -357,9 +349,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -401,9 +391,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/jsdttestdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -452,9 +440,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/jsdttestdependency.xml"/>
+
<property
name="buildType"
value="M"/>
@@ -615,9 +601,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="passBuildEvenIfFailedTests"
value="true"/>
@@ -724,9 +708,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="M"/>
@@ -799,9 +781,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/testdependency.xml"/>
+
<property
name="buildType"
value="S"/>
@@ -871,9 +851,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -943,9 +921,7 @@
<property
name="dependencyFileLocation"
value="indigo4/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo4/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -998,9 +974,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/testdependency.xml"/>
+
<property
name="buildType"
value="N"/>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
index e9d34135a945c19cb089199fc6d4a587f12386d3..e78a891e5cc94372a280e60823a174bb0f38148f 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index 4e9daac758cac087178109bf034198cbe2bceef9..1de418655e8c58e5dd1ce53c6b47355ed9829c39 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -239,8 +239,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/components/dali-sdk/build.properties b/releng.wtpbuilder/components/dali-sdk/build.properties
index 7eb2710528158d8e25b46a44a6d13e5adf58e831..ec9f8df67b820369786fb27b68c51332924c55a9 100644
--- a/releng.wtpbuilder/components/dali-sdk/build.properties
+++ b/releng.wtpbuilder/components/dali-sdk/build.properties
@@ -46,6 +46,7 @@ parallelCompilation=true
generateSourceReferences=true
compilelogsDir=compilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jpt_sdk.assembly.feature
+topLevelElementId=org.eclipse.jpt_sdk.assembly.feature
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index 9c9762d8d7c5542c30061fafbe14583a76e22256..33179f2bc34d2a87dd208d35f51f848b2574208d 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/dali-sdk/dependency.xml b/releng.wtpbuilder/components/dali-sdk/dependency.xml
deleted file mode 100644
index 87fbfb0d31239970c1a7882214d841d1f7751c96..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/components/dali-sdk/dependency.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
-
- ======================================================================
--->
-<project
- name="test"
- default="get">
-
- <target
- name="get">
-
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
-
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
-
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
-
diff --git a/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..bea36b966c9007ed64f49be75ccfd7234b0414fc
--- /dev/null
+++ b/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=false
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
diff --git a/releng.wtpbuilder/components/dali.tests/build.properties b/releng.wtpbuilder/components/dali.tests/build.properties
index 0fce6a2b3d0415c1f2f591c5bc9350c7d9f8b10c..72053e7d3747beb7ad01b4764470cc6da1966a08 100644
--- a/releng.wtpbuilder/components/dali.tests/build.properties
+++ b/releng.wtpbuilder/components/dali.tests/build.properties
@@ -43,8 +43,10 @@ skipMirroring=true
flattenDependencies=true
parallelCompilation=true
+generateSourceReferences=true
+
compilelogsDir=testcompilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jpt.tests.assembly.feature
-generateSourceReferences=true
+topLevelElementId=org.eclipse.jpt.tests.assembly.feature
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 7232cc9d444cc1ad302f12fa43d55eec17e6803f..7478783fbedfc024167de9b79ed92810332ae8b2 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml
deleted file mode 100644
index e72f14eea9e3a1e0767468acb836f0e764fd7c77..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/components/dali.tests/dependency.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
-
-
- ======================================================================
--->
-<project
- name="test"
- default="get">
-
- <target
- name="get">
-
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
-
- </target>
-
-
- <target
- name="getAndInstall"
- unless="skipGetAndInstall"
- if="${groupId}.url">
-
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
-
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties b/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..79c7152bb1614f44f8269d54e99691d6787b90d4
--- /dev/null
+++ b/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst-sdk/build.properties b/releng.wtpbuilder/components/jst-sdk/build.properties
index a052c883c8d4c19b8f42ed66cc46453a299498a9..818ac6328e79de1adf4504daef2a2adbe41d204a 100644
--- a/releng.wtpbuilder/components/jst-sdk/build.properties
+++ b/releng.wtpbuilder/components/jst-sdk/build.properties
@@ -40,9 +40,13 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
+flattenDependencies=true
+parallelCompilation=true
+
+generateSourceReferences=true
+
compilelogsDir=compilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jst.sdk
-flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
+topLevelElementId=org.eclipse.jst.sdk
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index 06fa9f1f45bec4049d79d2900687bc66ec5fceda..f525e0555d1f23d31caaf0ca3b4c7ef919b1dde8 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
deleted file mode 100644
index c33c43d35fa3a5c10cb400d8f5044d258ac7e1ec..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dita"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/jst-sdk/tobeInstalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..79c7152bb1614f44f8269d54e99691d6787b90d4
--- /dev/null
+++ b/releng.wtpbuilder/components/jst-sdk/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst.tests/build.properties b/releng.wtpbuilder/components/jst.tests/build.properties
index d733e98c307ad79e207dae554cda4fcff7f9ddbf..ef8e517b64628fd9e4211d76f43392e2a141433c 100644
--- a/releng.wtpbuilder/components/jst.tests/build.properties
+++ b/releng.wtpbuilder/components/jst.tests/build.properties
@@ -40,9 +40,13 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
+flattenDependencies=true
+parallelCompilation=true
+
+generateSourceReferences=true
+
compilelogsDir=testcompilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jst.tests
-flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
+topLevelElementId=org.eclipse.jst.tests
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 7232cc9d444cc1ad302f12fa43d55eec17e6803f..7478783fbedfc024167de9b79ed92810332ae8b2 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
deleted file mode 100644
index 144f2540b238d6b5d6409aeb081b7a650cda1a8e..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst.tests/tobeInstalled.properties b/releng.wtpbuilder/components/jst.tests/tobeInstalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..79c7152bb1614f44f8269d54e99691d6787b90d4
--- /dev/null
+++ b/releng.wtpbuilder/components/jst.tests/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/build.properties b/releng.wtpbuilder/components/wst-sdk/build.properties
index 3c397e1d4cf5bdc71ebe747dc880d315cc57bfc6..e5fbf59651129ef1f1d349aae3cdb689867758e4 100644
--- a/releng.wtpbuilder/components/wst-sdk/build.properties
+++ b/releng.wtpbuilder/components/wst-sdk/build.properties
@@ -40,11 +40,14 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
-compilelogsDir=compilelogs
-topLevelElementType=feature
-topLevelElementId=org.eclipse.wst.sdk
-
flattenDependencies=true
parallelCompilation=true
+generateSourceReferences=true
+
+compilelogsDir=compilelogs
+
+topLevelElementType=feature
+
+topLevelElementId=org.eclipse.wst.sdk
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 2922c65036e76c56efafc0f7961476bc9cee2ec4..6c9e3bd93913eed29f1e12f056d34cba387a9494 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -156,11 +156,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
deleted file mode 100644
index d1ebfc0e3829448dda22bdc7d8c0816cb8f15aa2..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dita"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
-
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/wst-sdk/tobeInstalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..c94b8663000a7a28d745a4a57d271aab9bf7fab0
--- /dev/null
+++ b/releng.wtpbuilder/components/wst-sdk/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst.tests/build.properties b/releng.wtpbuilder/components/wst.tests/build.properties
index ef3a3a73459cc9c5036c4c6c34e58bbb555f5d72..9a9cd7a5b1b93cf302a285f02f6d7d5615c97b68 100644
--- a/releng.wtpbuilder/components/wst.tests/build.properties
+++ b/releng.wtpbuilder/components/wst.tests/build.properties
@@ -40,9 +40,13 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
+flattenDependencies=true
+parallelCompilation=true
+
+generateSourceReferences=true
+
compilelogsDir=testcompilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.wst.tests.feature
-flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
+topLevelElementId=org.eclipse.wst.tests.feature
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index c8459f40923177621f21125848a591c2f3d84d08..7b3e4762f82580bcca3ec21b1f43b4ae5eab75e2 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -156,11 +156,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
deleted file mode 100644
index 1b1be4e5b0e81a9d0e28531fd89ac9fff6efc53b..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst.tests/tobeInstalled.properties b/releng.wtpbuilder/components/wst.tests/tobeInstalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..79c7152bb1614f44f8269d54e99691d6787b90d4
--- /dev/null
+++ b/releng.wtpbuilder/components/wst.tests/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index 45bc1dfdbf7d70e386a25080fb05665ed697aca9..7f204d5b47254d3ff1cb2a9b01ae5ef07cf8f51d 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches32x.site/build.xml b/releng.wtpbuilder/distribution/patches32x.site/build.xml
index 45bc1dfdbf7d70e386a25080fb05665ed697aca9..7f204d5b47254d3ff1cb2a9b01ae5ef07cf8f51d 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/build.xml b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
index 17be308191219191f0a1baa3282fd974d9e44e0a..65389203f46a70af19d96e42f587e8c320bdf253 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
@@ -336,8 +336,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 45bc1dfdbf7d70e386a25080fb05665ed697aca9..7f204d5b47254d3ff1cb2a9b01ae5ef07cf8f51d 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 041d254fb72a55a5d1b8b5ab5d7adfbb86159c8c..cb7fe271cb9a4e2d6c6a93fdc2666efb43213e04 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -93,19 +93,29 @@
unless="dependency.properties.exists"/>
<property
name="test.dependency"
- value="${buildDirectory}/maps/${env.RELENG}/${testdependencyFileLocation}"/>
+ value="${wtp.builder.home}/scripts/dependency/dependency.xml"/>
<available
file="${test.dependency}"
property="test.dependency.exists"/>
<fail
message="test dependency file not found: ${test.dependency}"
unless="test.dependency.exists"/>
+ <echo message="test.dependency file: ${test.dependency}" />
<ant
antfile="${test.dependency}"
target="get">
<property
name="base.install.dir"
value="${testRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${wtp.builder.home}/distribution/${build.distribution}.tests/tobeInstalled.properties"/>
+ <property
+ name="installWorkingDirectory"
+ value="${testRoot}"/>
+
+
+
</ant>
<antcall
target="unzipTests"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
index 7ae504726ab2f384cb9e99be7fc74235d1b0395d..c8a366fe156a1c65156b80034876dc34e123653f 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
@@ -258,8 +258,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.tests/tobeInstalled.properties b/releng.wtpbuilder/distribution/wtp.tests/tobeInstalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..babb454ee37d570b77e1e54de7ea0f4b0a26fc91
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.tests/tobeInstalled.properties
@@ -0,0 +1,14 @@
+getprereq.eclipse=true
+getprereq.eclipsetestframework=true
+#getprereq.eclipseplatform=false
+getprereq.emf=false
+getprereq.emfxsd=false
+#getprereq.emfvalidation=false
+getprereq.gef=false
+getprereq.dtp=false
+#getprereq.wst=false
+#getprereq.jst=false
+getprereq.wtp=false
+#getprereq.dltk=false
+
+getprereq.testlibraries=true
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 3358fa05569c8583fd9b048fba7cbbb3962b317c..99cf3d86f812b18ca091875e7e29a543c297cc11 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -468,8 +468,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg