diff --git a/src/etc/testcases/taskdefs/conditions/http.xml b/src/etc/testcases/taskdefs/conditions/http.xml
index 96478c602..76ae9fabf 100644
--- a/src/etc/testcases/taskdefs/conditions/http.xml
+++ b/src/etc/testcases/taskdefs/conditions/http.xml
@@ -23,34 +23,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/etc/testcases/taskdefs/get.xml b/src/etc/testcases/taskdefs/get.xml
index 166c42350..a10a414f1 100644
--- a/src/etc/testcases/taskdefs/get.xml
+++ b/src/etc/testcases/taskdefs/get.xml
@@ -35,11 +35,11 @@
-
+
-
+
@@ -80,7 +80,7 @@
-
@@ -99,21 +99,21 @@
-
+
-
+
-
+
@@ -121,7 +121,7 @@
-
+
diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index de2de1499..c191ed289 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -269,7 +269,7 @@
-
+
diff --git a/src/etc/testcases/taskdefs/optional/junitreport-with-include/junit-frames.xsl b/src/etc/testcases/taskdefs/optional/junitreport-with-include/junit-frames.xsl
index ecd01f86e..135ac8310 100644
--- a/src/etc/testcases/taskdefs/optional/junitreport-with-include/junit-frames.xsl
+++ b/src/etc/testcases/taskdefs/optional/junitreport-with-include/junit-frames.xsl
@@ -696,7 +696,7 @@ h6 {
diff --git a/src/etc/testcases/taskdefs/optional/junitreport/junit-frames.xsl b/src/etc/testcases/taskdefs/optional/junitreport/junit-frames.xsl
index e94645b72..55dd776fa 100644
--- a/src/etc/testcases/taskdefs/optional/junitreport/junit-frames.xsl
+++ b/src/etc/testcases/taskdefs/optional/junitreport/junit-frames.xsl
@@ -696,7 +696,7 @@ h6 {
diff --git a/src/etc/testcases/taskdefs/signjar.xml b/src/etc/testcases/taskdefs/signjar.xml
index 7929fa775..7d0ab25ce 100644
--- a/src/etc/testcases/taskdefs/signjar.xml
+++ b/src/etc/testcases/taskdefs/signjar.xml
@@ -80,7 +80,7 @@
-
+
diff --git a/src/etc/testcases/taskdefs/touch.xml b/src/etc/testcases/taskdefs/touch.xml
index d3bab7c63..750311d7a 100644
--- a/src/etc/testcases/taskdefs/touch.xml
+++ b/src/etc/testcases/taskdefs/touch.xml
@@ -45,8 +45,8 @@
-
-
+
+
diff --git a/src/tests/antunit/core/ref-propertyhelper-test.xml b/src/tests/antunit/core/ref-propertyhelper-test.xml
index cdd2f9580..c6b2f16de 100644
--- a/src/tests/antunit/core/ref-propertyhelper-test.xml
+++ b/src/tests/antunit/core/ref-propertyhelper-test.xml
@@ -97,8 +97,8 @@ public class Task {
-
+
-
+
diff --git a/src/tests/antunit/junit-frames.xsl b/src/tests/antunit/junit-frames.xsl
index 3392b5edb..bbb0c7643 100644
--- a/src/tests/antunit/junit-frames.xsl
+++ b/src/tests/antunit/junit-frames.xsl
@@ -695,7 +695,7 @@ h6 {
diff --git a/src/tests/antunit/junit-noframes.xsl b/src/tests/antunit/junit-noframes.xsl
index 5309c34ad..2f5e4fb68 100644
--- a/src/tests/antunit/junit-noframes.xsl
+++ b/src/tests/antunit/junit-noframes.xsl
@@ -318,7 +318,7 @@ under the License.
diff --git a/src/tests/antunit/taskdefs/bunzip2-test.xml b/src/tests/antunit/taskdefs/bunzip2-test.xml
index 8cf202a68..76148d946 100644
--- a/src/tests/antunit/taskdefs/bunzip2-test.xml
+++ b/src/tests/antunit/taskdefs/bunzip2-test.xml
@@ -30,9 +30,9 @@
-
+
-
@@ -40,9 +40,9 @@
-
+
-
diff --git a/src/tests/antunit/taskdefs/condition/resourceexists-test.xml b/src/tests/antunit/taskdefs/condition/resourceexists-test.xml
index 4d1370728..b50a00d29 100644
--- a/src/tests/antunit/taskdefs/condition/resourceexists-test.xml
+++ b/src/tests/antunit/taskdefs/condition/resourceexists-test.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/src/tests/antunit/taskdefs/copy-test.xml b/src/tests/antunit/taskdefs/copy-test.xml
index 87b3cbfb6..14a4bece0 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -187,7 +187,7 @@ public class NullByteStreamResource extends Resource {
-
+
diff --git a/src/tests/antunit/taskdefs/get-test.xml b/src/tests/antunit/taskdefs/get-test.xml
index f3ad2e610..b6b5e11b6 100644
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@ -19,7 +19,7 @@
-
+
@@ -103,8 +103,8 @@
-
-
+
+
diff --git a/src/tests/antunit/taskdefs/gunzip-test.xml b/src/tests/antunit/taskdefs/gunzip-test.xml
index 1c325c8a8..f8ec6d9d6 100644
--- a/src/tests/antunit/taskdefs/gunzip-test.xml
+++ b/src/tests/antunit/taskdefs/gunzip-test.xml
@@ -40,9 +40,9 @@
-
+
-
@@ -50,9 +50,9 @@
-
+
-
diff --git a/src/tests/antunit/taskdefs/jar-test.xml b/src/tests/antunit/taskdefs/jar-test.xml
index 7f11d2038..2ae557abd 100644
--- a/src/tests/antunit/taskdefs/jar-test.xml
+++ b/src/tests/antunit/taskdefs/jar-test.xml
@@ -249,7 +249,7 @@ Main-Class: MyClass
resource="${output}/META-INF/MANIFEST.MF"/>
-
+
diff --git a/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml b/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
index 355813f3a..89252b70d 100644
--- a/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
+++ b/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
@@ -41,9 +41,9 @@
-
+
-
@@ -51,9 +51,9 @@
-
+
-
diff --git a/src/tests/antunit/taskdefs/property-test.xml b/src/tests/antunit/taskdefs/property-test.xml
index 4051906a1..59f000fc6 100644
--- a/src/tests/antunit/taskdefs/property-test.xml
+++ b/src/tests/antunit/taskdefs/property-test.xml
@@ -154,7 +154,7 @@ b=$${a}
diff --git a/src/tests/antunit/taskdefs/retry-test.xml b/src/tests/antunit/taskdefs/retry-test.xml
index 044b62c83..fc99537d7 100644
--- a/src/tests/antunit/taskdefs/retry-test.xml
+++ b/src/tests/antunit/taskdefs/retry-test.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/src/tests/antunit/types/resources/selectors/test-componentdef.xml b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
index 1e0789806..384682ebd 100644
--- a/src/tests/antunit/types/resources/selectors/test-componentdef.xml
+++ b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
@@ -81,7 +81,7 @@
-
+
diff --git a/src/tests/antunit/types/resources/selectors/test.xml b/src/tests/antunit/types/resources/selectors/test.xml
index 0aad126cb..b758eb491 100644
--- a/src/tests/antunit/types/resources/selectors/test.xml
+++ b/src/tests/antunit/types/resources/selectors/test.xml
@@ -85,7 +85,7 @@
-
+
diff --git a/src/tests/antunit/types/resources/test.xml b/src/tests/antunit/types/resources/test.xml
index 03efdc9f9..7afeb5c50 100644
--- a/src/tests/antunit/types/resources/test.xml
+++ b/src/tests/antunit/types/resources/test.xml
@@ -28,8 +28,8 @@
-
-
+
+
@@ -280,7 +280,7 @@
-
+