diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index 41019e5499759b60c992f8cacbbd7f9b4a9bda84..0055c2fd26e844fec558c894f0dca0263ba49c4d 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
@@ -47,10 +47,14 @@
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+        
+        <antcall 
+            target="getAndInstall"> 
+            <param 
+                 name="groupId"
+                 value="dtp"/> 
+        </antcall>
+        
         <antcall
             target="getAndInstall">
             <param
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
index ceeb396f0b98196e841531a47cb8fe526ee0823b..d32292f24d21e7bdded5b117c7f9140d8cb86c5a 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
@@ -12,21 +12,50 @@
         name="get">
         <!--
             read in this properties, just so we can make sure our
-            requested pre-reqs are defined
+            requested pre-reqs are defined, which we do later with
+            statements such if="${groupId}.url"
         -->
         <property
             file="${dependency.properties}"/>
  
+        <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="emfvalidation"/>
+       </antcall>
+       <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+        
+        <antcall 
+            target="getAndInstall"> 
+            <param 
+                 name="groupId"
+                 value="dtp"/> 
+        </antcall>
+        
         <antcall
             target="getAndInstall">
             <param
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
index 51252c5bf2b20756b16b6ebbf749319dd5a5a9a5..bfa9f19e46144dfb61fd4e8d30ebca6a88d9f044 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
@@ -12,7 +12,8 @@
         name="get">
         <!--
             read in this properties, just so we can make sure our
-            requested pre-reqs are defined
+            requested pre-reqs are defined, which we do later with
+            statements such if="${groupId}.url"
         -->
         <property
             file="${dependency.properties}"/>
@@ -29,10 +30,44 @@
                 name="groupId"
                 value="eclipseTestFramework"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+                <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="emfvalidation"/>
+       </antcall>
+       <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipse"/>
+        </antcall>
+        
+        <antcall 
+            target="getAndInstall"> 
+            <param 
+                 name="groupId"
+                 value="dtp"/> 
+        </antcall>
+        
         <antcall
             target="getAndInstall">
             <param
diff --git a/releng.wtpbuilder/components/pave/dependency.xml b/releng.wtpbuilder/components/pave/dependency.xml
index b0c27d284842f30319a7c9b3f37f8ccb7f63deec..40cdbfa8a8f3150646066791cdbf8a95adb9020d 100644
--- a/releng.wtpbuilder/components/pave/dependency.xml
+++ b/releng.wtpbuilder/components/pave/dependency.xml
@@ -47,10 +47,14 @@
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+        
+        <antcall 
+            target="getAndInstall"> 
+            <param 
+                 name="groupId"
+                 value="dtp"/> 
+        </antcall>
+        
         <antcall
             target="getAndInstall">
             <param
diff --git a/releng.wtpbuilder/components/pave_sdk/dependency.xml b/releng.wtpbuilder/components/pave_sdk/dependency.xml
index 9595b398207cfa0f67709d9b49f000b504a46d08..acf7710a53f76788403bd124e3b2718edbd27cc0 100644
--- a/releng.wtpbuilder/components/pave_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/pave_sdk/dependency.xml
@@ -12,21 +12,50 @@
         name="get">
         <!--
             read in this properties, just so we can make sure our
-            requested pre-reqs are defined
+            requested pre-reqs are defined, which we do later with
+            statements such if="${groupId}.url"
         -->
         <property
             file="${dependency.properties}"/>
  
+        <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="emfvalidation"/>
+       </antcall>
+       <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+        
+        <antcall 
+            target="getAndInstall"> 
+            <param 
+                 name="groupId"
+                 value="dtp"/> 
+        </antcall>
+        
         <antcall
             target="getAndInstall">
             <param
diff --git a/releng.wtpbuilder/components/pave_tests/dependency.xml b/releng.wtpbuilder/components/pave_tests/dependency.xml
index b4b3e9c14e6a440a7f8c502132f2cc1f48b12bf7..ae903dc7e0b853db0df8d66b27c822052425690a 100644
--- a/releng.wtpbuilder/components/pave_tests/dependency.xml
+++ b/releng.wtpbuilder/components/pave_tests/dependency.xml
@@ -12,7 +12,8 @@
         name="get">
         <!--
             read in this properties, just so we can make sure our
-            requested pre-reqs are defined
+            requested pre-reqs are defined, which we do later with
+            statements such if="${groupId}.url"
         -->
         <property
             file="${dependency.properties}"/>
@@ -29,10 +30,44 @@
                 name="groupId"
                 value="eclipseTestFramework"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+                <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="emfvalidation"/>
+       </antcall>
+       <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipse"/>
+        </antcall>
+        
+        <antcall 
+            target="getAndInstall"> 
+            <param 
+                 name="groupId"
+                 value="dtp"/> 
+        </antcall>
+        
         <antcall
             target="getAndInstall">
             <param