diff --git a/releng.wtpbuilder/components/dali-sdk/dependency.xml b/releng.wtpbuilder/components/dali-sdk/dependency.xml
index 36347d4..f5ce4bc 100644
--- a/releng.wtpbuilder/components/dali-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/dali-sdk/dependency.xml
@@ -49,19 +49,17 @@
 
     </target>
 
-    <target name="getAndInstall">
+    <target name="getAndInstall" if="${groupId}.file">
         <ant
             antfile="${dependencyTargets}"
-            target="checkDependency"
-        	  if="${groupId}.file">
+            target="checkDependency">
             <property
                 name="groupId"
                 value="${groupId}" />
         </ant>
         <ant
             antfile="${dependencyTargets}"
-            target="installDependency"
-        	  if="${groupId}.file">
+            target="installDependency">
             <property
                 name="groupId"
                 value="${groupId}" />
diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml
index 60fcd13..f9c3898 100644
--- a/releng.wtpbuilder/components/dali.tests/dependency.xml
+++ b/releng.wtpbuilder/components/dali.tests/dependency.xml
@@ -1,48 +1,54 @@
 <?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
+    <!--
+        ======================================================================
+        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">
+    <target
+        name="get">
 
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="emf" />
+                value="emf"/>
         </antcall>
-      <antcall target="getAndInstall">
-          <param
-              name="groupId"
-              value="emfxsd" />
-      </antcall>    	
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="gef" />
+                value="emfxsd"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="dtp" />
+                value="gef"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="eclipse" />
+                value="dtp"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="eclipseTestFramework" />
+                value="eclipse"/>
+        </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
         </antcall>
 
     </target>
@@ -50,26 +56,25 @@
 
     <target
         name="getAndInstall"
-        unless="skipGetAndInstall">
+        unless="skipGetAndInstall"
+        if="${groupId}.file">
 
         <ant
             antfile="${dependencyTargets}"
-            target="checkDependency"
-        	  if="${groupId}.file">
+            target="checkDependency">
             <property
                 name="groupId"
-                value="${groupId}" />
+                value="${groupId}"/>
         </ant>
         <ant
             antfile="${dependencyTargets}"
-            target="installDependency"
-        	  if="${groupId}.file">
+            target="installDependency">
             <property
                 name="groupId"
-                value="${groupId}" />
+                value="${groupId}"/>
             <property
                 name="install.destination"
-                value="${base.install.dir}" />
+                value="${base.install.dir}"/>
         </ant>
 
     </target>
diff --git a/releng.wtpbuilder/components/dali/dependency.xml b/releng.wtpbuilder/components/dali/dependency.xml
index 3a5f3ec..97e8cdd 100644
--- a/releng.wtpbuilder/components/dali/dependency.xml
+++ b/releng.wtpbuilder/components/dali/dependency.xml
@@ -46,20 +46,18 @@
       </antcall>
     </target>
 
-    <target name="getAndInstall">
+    <target name="getAndInstall" if="${groupId}.file">
 
         <ant
             antfile="${dependencyTargets}"
-            target="checkDependency"
-        	  if="${groupId}.file">
+            target="checkDependency">
             <property
                 name="groupId"
                 value="${groupId}" />
         </ant>
         <ant
             antfile="${dependencyTargets}"
-            target="installDependency"
-        	  if="${groupId}.file">
+            target="installDependency">
             <property
                 name="groupId"
                 value="${groupId}" />