diff --git a/build.xml b/build.xml
index d05b528..e8cbd91 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/changes.xml b/changes.xml
index dd790b9..4a9351e 100644
--- a/changes.xml
+++ b/changes.xml
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/contributors.xml b/contributors.xml
index 00db496..842d978 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/antunit.html b/docs/antunit.html
index 92b819c..8c48463 100644
--- a/docs/antunit.html
+++ b/docs/antunit.html
@@ -7,7 +7,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
@@ -79,7 +79,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/docs/assert.html b/docs/assert.html
index e6481d2..ed61257 100644
--- a/docs/assert.html
+++ b/docs/assert.html
@@ -6,7 +6,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/assertions.html b/docs/assertions.html
index e460628..f7123f0 100644
--- a/docs/assertions.html
+++ b/docs/assertions.html
@@ -6,7 +6,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/expectfailure.html b/docs/expectfailure.html
index a224c86..2197153 100644
--- a/docs/expectfailure.html
+++ b/docs/expectfailure.html
@@ -6,7 +6,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/failurelistener.html b/docs/failurelistener.html
index c894c24..8b70e23 100644
--- a/docs/failurelistener.html
+++ b/docs/failurelistener.html
@@ -1,61 +1,61 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html>
-  <head>
-    <meta http-equiv="Content-Language" content="en-us"></meta>
-    <link rel="stylesheet" type="text/css" href="style.css">
-    <title>XMLListener AntUnit Listener</title>
-  </head>
-
-  <body>
-    <h2><a name="xmllistener">Failure AntUnit Listener</a></h2>
-
-    <h3>Description</h3>
-
-    <p>Writes reports similar to the &quot;failure&quot; JUnit formatter.</p><p>This AntUnitListener creates a new buildfile with a target for each failed test target in the AntUnit run. The generated target calls the failed target (with setUp and tearDown if present in the called project). <br></p><p>This is intended for rerunning just failed tests.<br></p>
-
-    
-
-    <h3>Parameters</h3>
-    <table border="1" cellpadding="2" cellspacing="0">
-      <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
-      </tr>
-      <tr>
-        <td valign="top">file</td>
-        <td valign="top">Where to write the generated buildfile.<br></td>
-        <td align="center">Yes.</td>
-      </tr>
-    </table>
-
-    <h3>Examples</h3>
-
-<pre> <br>    &lt;au:antunit&gt; 
-      &lt;fileset dir=&quot;${tests}&quot; includes=&quot;*.xml&quot;/&gt; 
-      &lt;au:failurelistener file=&quot;${build.dir}/failed-tests/failed.xml&quot;/&gt; 
-    &lt;/au:antunit&gt; <br>
-</pre>
-
-    <p>Runs AntUnit on all XML files in the directory
-    <code>${tests}</code> and collecting all failed tests. If there was a failure the file <code>${build.dir}/failed-tests/failed.xml</code> is created and has a <em>textXXX </em>target for each failed test. Additionally it has a default target <em>antunit</em> which runs all these failed tests.<br> </p>
-
-  </body>
-</html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html>
+  <head>
+    <meta http-equiv="Content-Language" content="en-us"></meta>
+    <link rel="stylesheet" type="text/css" href="style.css">
+    <title>XMLListener AntUnit Listener</title>
+  </head>
+
+  <body>
+    <h2><a name="xmllistener">Failure AntUnit Listener</a></h2>
+
+    <h3>Description</h3>
+
+    <p>Writes reports similar to the &quot;failure&quot; JUnit formatter.</p><p>This AntUnitListener creates a new buildfile with a target for each failed test target in the AntUnit run. The generated target calls the failed target (with setUp and tearDown if present in the called project). <br></p><p>This is intended for rerunning just failed tests.<br></p>
+
+    
+
+    <h3>Parameters</h3>
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">file</td>
+        <td valign="top">Where to write the generated buildfile.<br></td>
+        <td align="center">Yes.</td>
+      </tr>
+    </table>
+
+    <h3>Examples</h3>
+
+<pre> <br>    &lt;au:antunit&gt; 
+      &lt;fileset dir=&quot;${tests}&quot; includes=&quot;*.xml&quot;/&gt; 
+      &lt;au:failurelistener file=&quot;${build.dir}/failed-tests/failed.xml&quot;/&gt; 
+    &lt;/au:antunit&gt; <br>
+</pre>
+
+    <p>Runs AntUnit on all XML files in the directory
+    <code>${tests}</code> and collecting all failed tests. If there was a failure the file <code>${build.dir}/failed-tests/failed.xml</code> is created and has a <em>textXXX </em>target for each failed test. Additionally it has a default target <em>antunit</em> which runs all these failed tests.<br> </p>
+
+  </body>
+</html>
diff --git a/docs/index.html b/docs/index.html
index bda6c00..70815b1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/logcontent.html b/docs/logcontent.html
index abf6afa..161cc7e 100644
--- a/docs/logcontent.html
+++ b/docs/logcontent.html
@@ -7,7 +7,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/docs/logforwarder.html b/docs/logforwarder.html
index 1f7b20b..7131011 100644
--- a/docs/logforwarder.html
+++ b/docs/logforwarder.html
@@ -7,7 +7,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/docs/plainlistener.html b/docs/plainlistener.html
index a7a7428..fd69632 100644
--- a/docs/plainlistener.html
+++ b/docs/plainlistener.html
@@ -7,7 +7,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/docs/xmllistener.html b/docs/xmllistener.html
index 9a2e048..ecdbdfc 100644
--- a/docs/xmllistener.html
+++ b/docs/xmllistener.html
@@ -7,7 +7,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/ivy.xml b/ivy.xml
index cc8dcbc..8c6b542 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -8,7 +8,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,7 +23,7 @@
         revision="${artifact.version}"
         publication="${artifact.publication.datetime}">
     <license name="Apache Software License 2.0"
-             url="http://www.apache.org/licenses/LICENSE-2.0"/>
+             url="https://www.apache.org/licenses/LICENSE-2.0"/>
     <ivyauthor name="Apache Ant Development Team"
                url="http://ant.apache.org/"/>
     <description homepage="http://ant.apache.org/antlibs/antunit/">
diff --git a/prepare.xml b/prepare.xml
index 8499ea6..0995174 100644
--- a/prepare.xml
+++ b/prepare.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/project-template.pom b/project-template.pom
index a34e656..4abd27d 100644
--- a/project-template.pom
+++ b/project-template.pom
@@ -7,7 +7,7 @@
    2.0 (the "License"); you may not use this file except in compliance
    with the License. You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+   https://www.apache.org/licenses/LICENSE-2.0 Unless required by
    applicable law or agreed to in writing, software distributed under the
    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied. See the License for
@@ -28,7 +28,7 @@
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 8a746e2..6af69c1 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -15,7 +15,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index eb58896..461d95c 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -13,7 +13,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit.xml b/src/etc/testcases/antunit.xml
index 3090ccb..5662b39 100644
--- a/src/etc/testcases/antunit.xml
+++ b/src/etc/testcases/antunit.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/base.xml b/src/etc/testcases/antunit/base.xml
index a69d822..c3d7e96 100644
--- a/src/etc/testcases/antunit/base.xml
+++ b/src/etc/testcases/antunit/base.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/copy.xml b/src/etc/testcases/antunit/copy.xml
index c3a394c..fa48bd0 100644
--- a/src/etc/testcases/antunit/copy.xml
+++ b/src/etc/testcases/antunit/copy.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/echo.xml b/src/etc/testcases/antunit/echo.xml
index 8dee413..6d51622 100644
--- a/src/etc/testcases/antunit/echo.xml
+++ b/src/etc/testcases/antunit/echo.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/java-io.xml b/src/etc/testcases/antunit/java-io.xml
index 899bc28..6721ce5 100644
--- a/src/etc/testcases/antunit/java-io.xml
+++ b/src/etc/testcases/antunit/java-io.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/junit.xml b/src/etc/testcases/antunit/junit.xml
index 957c2ab..f98d11b 100644
--- a/src/etc/testcases/antunit/junit.xml
+++ b/src/etc/testcases/antunit/junit.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/property.xml b/src/etc/testcases/antunit/property.xml
index 3a4440c..f87563b 100644
--- a/src/etc/testcases/antunit/property.xml
+++ b/src/etc/testcases/antunit/property.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/reference-mapper.xml b/src/etc/testcases/antunit/reference-mapper.xml
index c815bff..1a6bfef 100644
--- a/src/etc/testcases/antunit/reference-mapper.xml
+++ b/src/etc/testcases/antunit/reference-mapper.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/reference-regex.xml b/src/etc/testcases/antunit/reference-regex.xml
index 62281a1..b01f565 100644
--- a/src/etc/testcases/antunit/reference-regex.xml
+++ b/src/etc/testcases/antunit/reference-regex.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/reference-set.xml b/src/etc/testcases/antunit/reference-set.xml
index 86f09e8..c63691d 100644
--- a/src/etc/testcases/antunit/reference-set.xml
+++ b/src/etc/testcases/antunit/reference-set.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/reference.xml b/src/etc/testcases/antunit/reference.xml
index eba8085..c3b571a 100644
--- a/src/etc/testcases/antunit/reference.xml
+++ b/src/etc/testcases/antunit/reference.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/both.xml b/src/etc/testcases/antunit/setupandteardown/both.xml
index e2fdd89..318557e 100644
--- a/src/etc/testcases/antunit/setupandteardown/both.xml
+++ b/src/etc/testcases/antunit/setupandteardown/both.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project name="setup-and-teardown"
-    default="all"
-         xmlns:au="antlib:org.apache.ant.antunit">
-
-  <target name="all">
-    <fail message="These are not standalone tests." />
-  </target>
-
-  <target name="setUp">
-    <fail message="outputfile property is not set." unless="outputfile" />
-    <echo file="${outputfile}" append="true" message="S" />
-  </target>
-
-  <target name="test1">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test2">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test3">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test4">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="tearDown">
-    <echo file="${outputfile}" append="true" message="T" />
-  </target>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project name="setup-and-teardown"
+    default="all"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <target name="all">
+    <fail message="These are not standalone tests." />
+  </target>
+
+  <target name="setUp">
+    <fail message="outputfile property is not set." unless="outputfile" />
+    <echo file="${outputfile}" append="true" message="S" />
+  </target>
+
+  <target name="test1">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test2">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test3">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test4">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="tearDown">
+    <echo file="${outputfile}" append="true" message="T" />
+  </target>
+
+</project>
diff --git a/src/etc/testcases/antunit/setupandteardown/bothsuite.xml b/src/etc/testcases/antunit/setupandteardown/bothsuite.xml
index 524b20b..1bd3698 100644
--- a/src/etc/testcases/antunit/setupandteardown/bothsuite.xml
+++ b/src/etc/testcases/antunit/setupandteardown/bothsuite.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/errorsetup.xml b/src/etc/testcases/antunit/setupandteardown/errorsetup.xml
index 82fe26a..02e0d7d 100644
--- a/src/etc/testcases/antunit/setupandteardown/errorsetup.xml
+++ b/src/etc/testcases/antunit/setupandteardown/errorsetup.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/errorsuitesetup.xml b/src/etc/testcases/antunit/setupandteardown/errorsuitesetup.xml
index 96ecb88..1afb10b 100644
--- a/src/etc/testcases/antunit/setupandteardown/errorsuitesetup.xml
+++ b/src/etc/testcases/antunit/setupandteardown/errorsuitesetup.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/errorsuiteteardown.xml b/src/etc/testcases/antunit/setupandteardown/errorsuiteteardown.xml
index 8960fff..6796178 100644
--- a/src/etc/testcases/antunit/setupandteardown/errorsuiteteardown.xml
+++ b/src/etc/testcases/antunit/setupandteardown/errorsuiteteardown.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/errorteardown.xml b/src/etc/testcases/antunit/setupandteardown/errorteardown.xml
index 56c4995..a635548 100644
--- a/src/etc/testcases/antunit/setupandteardown/errorteardown.xml
+++ b/src/etc/testcases/antunit/setupandteardown/errorteardown.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/failedsetup.xml b/src/etc/testcases/antunit/setupandteardown/failedsetup.xml
index 94baa84..e5f5384 100644
--- a/src/etc/testcases/antunit/setupandteardown/failedsetup.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failedsetup.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project name="failed-test"
-    default="all"
-         xmlns:au="antlib:org.apache.ant.antunit">
-
-  <target name="all">
-    <fail message="These are not standalone tests." />
-  </target>
-
-  <target name="setUp">
-    <echo file="${outputfile}" append="true" message="S" />
-    <fail message="Expected failure" />
-  </target>
-
-  <target name="test1">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="tearDown">
-    <echo file="${outputfile}" append="true" message="T" />
-  </target>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project name="failed-test"
+    default="all"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <target name="all">
+    <fail message="These are not standalone tests." />
+  </target>
+
+  <target name="setUp">
+    <echo file="${outputfile}" append="true" message="S" />
+    <fail message="Expected failure" />
+  </target>
+
+  <target name="test1">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="tearDown">
+    <echo file="${outputfile}" append="true" message="T" />
+  </target>
+
+</project>
diff --git a/src/etc/testcases/antunit/setupandteardown/failedteardown.xml b/src/etc/testcases/antunit/setupandteardown/failedteardown.xml
index 9a7cbae..0c4feb1 100644
--- a/src/etc/testcases/antunit/setupandteardown/failedteardown.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failedteardown.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project name="failed-test"
-    default="all"
-         xmlns:au="antlib:org.apache.ant.antunit">
-
-  <target name="all">
-    <fail message="These are not standalone tests." />
-  </target>
-
-  <target name="setUp">
-    <echo file="${outputfile}" append="true" message="S" />
-  </target>
-
-  <target name="test1">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="tearDown">
-    <echo file="${outputfile}" append="true" message="T" />
-    <fail message="Expected failure" />
-  </target>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project name="failed-test"
+    default="all"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <target name="all">
+    <fail message="These are not standalone tests." />
+  </target>
+
+  <target name="setUp">
+    <echo file="${outputfile}" append="true" message="S" />
+  </target>
+
+  <target name="test1">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="tearDown">
+    <echo file="${outputfile}" append="true" message="T" />
+    <fail message="Expected failure" />
+  </target>
+
+</project>
diff --git a/src/etc/testcases/antunit/setupandteardown/failedtest.xml b/src/etc/testcases/antunit/setupandteardown/failedtest.xml
index a33af70..1e064dc 100644
--- a/src/etc/testcases/antunit/setupandteardown/failedtest.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failedtest.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project name="failed-test"
-    default="all"
-         xmlns:au="antlib:org.apache.ant.antunit">
-
-  <target name="all">
-    <fail message="These are not standalone tests." />
-  </target>
-
-  <target name="setUp">
-    <fail message="outputfile property is not set." unless="outputfile" />
-    <echo file="${outputfile}" append="true" message="S" />
-  </target>
-
-  <target name="test1">
-    <echo file="${outputfile}" append="true" message="E" />
-    <fail message="Expected failure" />
-  </target>
-
-  <target name="tearDown">
-    <echo file="${outputfile}" append="true" message="T" />
-  </target>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project name="failed-test"
+    default="all"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <target name="all">
+    <fail message="These are not standalone tests." />
+  </target>
+
+  <target name="setUp">
+    <fail message="outputfile property is not set." unless="outputfile" />
+    <echo file="${outputfile}" append="true" message="S" />
+  </target>
+
+  <target name="test1">
+    <echo file="${outputfile}" append="true" message="E" />
+    <fail message="Expected failure" />
+  </target>
+
+  <target name="tearDown">
+    <echo file="${outputfile}" append="true" message="T" />
+  </target>
+
+</project>
diff --git a/src/etc/testcases/antunit/setupandteardown/failedtestsuite.xml b/src/etc/testcases/antunit/setupandteardown/failedtestsuite.xml
index 7b2d96d..5bb25ad 100644
--- a/src/etc/testcases/antunit/setupandteardown/failedtestsuite.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failedtestsuite.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/failuresetup.xml b/src/etc/testcases/antunit/setupandteardown/failuresetup.xml
index 9f52d49..f8f162d 100644
--- a/src/etc/testcases/antunit/setupandteardown/failuresetup.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failuresetup.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/failuresuitesetup.xml b/src/etc/testcases/antunit/setupandteardown/failuresuitesetup.xml
index c63c7fa..c6c6cb3 100644
--- a/src/etc/testcases/antunit/setupandteardown/failuresuitesetup.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failuresuitesetup.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/failuresuiteteardown.xml b/src/etc/testcases/antunit/setupandteardown/failuresuiteteardown.xml
index 839228c..7983f09 100644
--- a/src/etc/testcases/antunit/setupandteardown/failuresuiteteardown.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failuresuiteteardown.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/failureteardown.xml b/src/etc/testcases/antunit/setupandteardown/failureteardown.xml
index 47ac419..8c65c57 100644
--- a/src/etc/testcases/antunit/setupandteardown/failureteardown.xml
+++ b/src/etc/testcases/antunit/setupandteardown/failureteardown.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/nosetup.xml b/src/etc/testcases/antunit/setupandteardown/nosetup.xml
index 53b1f6c..d5c8c73 100644
--- a/src/etc/testcases/antunit/setupandteardown/nosetup.xml
+++ b/src/etc/testcases/antunit/setupandteardown/nosetup.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project name="no-setup"
-    default="all"
-         xmlns:au="antlib:org.apache.ant.antunit">
-
-  <target name="all">
-    <fail message="These are not standalone tests." />
-  </target>
-
-  <target name="test1">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test2">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test3">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test4">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="tearDown">
-    <echo file="${outputfile}" append="true" message="T" />
-  </target>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project name="no-setup"
+    default="all"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <target name="all">
+    <fail message="These are not standalone tests." />
+  </target>
+
+  <target name="test1">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test2">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test3">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test4">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="tearDown">
+    <echo file="${outputfile}" append="true" message="T" />
+  </target>
+
+</project>
diff --git a/src/etc/testcases/antunit/setupandteardown/nosuitesetup.xml b/src/etc/testcases/antunit/setupandteardown/nosuitesetup.xml
index 84451e8..8c6a746 100644
--- a/src/etc/testcases/antunit/setupandteardown/nosuitesetup.xml
+++ b/src/etc/testcases/antunit/setupandteardown/nosuitesetup.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/nosuiteteardown.xml b/src/etc/testcases/antunit/setupandteardown/nosuiteteardown.xml
index 223be3e..ea11751 100644
--- a/src/etc/testcases/antunit/setupandteardown/nosuiteteardown.xml
+++ b/src/etc/testcases/antunit/setupandteardown/nosuiteteardown.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/antunit/setupandteardown/noteardown.xml b/src/etc/testcases/antunit/setupandteardown/noteardown.xml
index b1629be..a346f4d 100644
--- a/src/etc/testcases/antunit/setupandteardown/noteardown.xml
+++ b/src/etc/testcases/antunit/setupandteardown/noteardown.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project name="no-teardown"
-    default="all"
-         xmlns:au="antlib:org.apache.ant.antunit">
-
-  <target name="all">
-    <fail message="These are not standalone tests." />
-  </target>
-
-  <target name="setUp">
-    <fail message="outputfile property is not set." unless="outputfile" />
-    <echo file="${outputfile}" append="true" message="S" />
-  </target>
-
-  <target name="test1">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test2">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test3">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-  <target name="test4">
-    <echo file="${outputfile}" append="true" message="E" />
-  </target>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project name="no-teardown"
+    default="all"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <target name="all">
+    <fail message="These are not standalone tests." />
+  </target>
+
+  <target name="setUp">
+    <fail message="outputfile property is not set." unless="outputfile" />
+    <echo file="${outputfile}" append="true" message="S" />
+  </target>
+
+  <target name="test1">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test2">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test3">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+  <target name="test4">
+    <echo file="${outputfile}" append="true" message="E" />
+  </target>
+
+</project>
diff --git a/src/etc/testcases/assert.xml b/src/etc/testcases/assert.xml
index 1afc91e..8859b3d 100644
--- a/src/etc/testcases/assert.xml
+++ b/src/etc/testcases/assert.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/expectfailure.xml b/src/etc/testcases/expectfailure.xml
index 9561749..1e586fa 100644
--- a/src/etc/testcases/expectfailure.xml
+++ b/src/etc/testcases/expectfailure.xml
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/listener/logforwarder.xml b/src/etc/testcases/listener/logforwarder.xml
index b09c27a..9348617 100644
--- a/src/etc/testcases/listener/logforwarder.xml
+++ b/src/etc/testcases/listener/logforwarder.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/listener/plainlistener.xml b/src/etc/testcases/listener/plainlistener.xml
index aa37b6c..c15365a 100644
--- a/src/etc/testcases/listener/plainlistener.xml
+++ b/src/etc/testcases/listener/plainlistener.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/listener/xmllistener.xml b/src/etc/testcases/listener/xmllistener.xml
index fe3e964..6254ecf 100644
--- a/src/etc/testcases/listener/xmllistener.xml
+++ b/src/etc/testcases/listener/xmllistener.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/etc/testcases/setupandteardown.xml b/src/etc/testcases/setupandteardown.xml
index 67a6a55..a1550e7 100644
--- a/src/etc/testcases/setupandteardown.xml
+++ b/src/etc/testcases/setupandteardown.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/AntUnit.java b/src/main/org/apache/ant/antunit/AntUnit.java
index a074166..9222c2d 100644
--- a/src/main/org/apache/ant/antunit/AntUnit.java
+++ b/src/main/org/apache/ant/antunit/AntUnit.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/AntUnitExecutionNotifier.java b/src/main/org/apache/ant/antunit/AntUnitExecutionNotifier.java
index 41fb8d3..6cb47be 100644
--- a/src/main/org/apache/ant/antunit/AntUnitExecutionNotifier.java
+++ b/src/main/org/apache/ant/antunit/AntUnitExecutionNotifier.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/AntUnitListener.java b/src/main/org/apache/ant/antunit/AntUnitListener.java
index 0a52fcb..2e3f8d6 100644
--- a/src/main/org/apache/ant/antunit/AntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/AntUnitListener.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java b/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java
index a5b92a8..891b22e 100644
--- a/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java
+++ b/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/AssertTask.java b/src/main/org/apache/ant/antunit/AssertTask.java
index 837051f..eda9c36 100644
--- a/src/main/org/apache/ant/antunit/AssertTask.java
+++ b/src/main/org/apache/ant/antunit/AssertTask.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/AssertionFailedException.java b/src/main/org/apache/ant/antunit/AssertionFailedException.java
index f5f10a9..f3e1299 100644
--- a/src/main/org/apache/ant/antunit/AssertionFailedException.java
+++ b/src/main/org/apache/ant/antunit/AssertionFailedException.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/ExpectFailureTask.java b/src/main/org/apache/ant/antunit/ExpectFailureTask.java
index 2d8699d..9ca607f 100644
--- a/src/main/org/apache/ant/antunit/ExpectFailureTask.java
+++ b/src/main/org/apache/ant/antunit/ExpectFailureTask.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/LogCapturer.java b/src/main/org/apache/ant/antunit/LogCapturer.java
index 601defb..0da6e73 100644
--- a/src/main/org/apache/ant/antunit/LogCapturer.java
+++ b/src/main/org/apache/ant/antunit/LogCapturer.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/LogContains.java b/src/main/org/apache/ant/antunit/LogContains.java
index 7a11396..ad6099f 100644
--- a/src/main/org/apache/ant/antunit/LogContains.java
+++ b/src/main/org/apache/ant/antunit/LogContains.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/LogContent.java b/src/main/org/apache/ant/antunit/LogContent.java
index 590fe67..d9dd710 100644
--- a/src/main/org/apache/ant/antunit/LogContent.java
+++ b/src/main/org/apache/ant/antunit/LogContent.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/ProjectFactory.java b/src/main/org/apache/ant/antunit/ProjectFactory.java
index ca77f94..d65a5c6 100644
--- a/src/main/org/apache/ant/antunit/ProjectFactory.java
+++ b/src/main/org/apache/ant/antunit/ProjectFactory.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/ResourceExists.java b/src/main/org/apache/ant/antunit/ResourceExists.java
index 4b4497b..63efcef 100644
--- a/src/main/org/apache/ant/antunit/ResourceExists.java
+++ b/src/main/org/apache/ant/antunit/ResourceExists.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/antlib.xml b/src/main/org/apache/ant/antunit/antlib.xml
index 4ed528b..36f12d4 100644
--- a/src/main/org/apache/ant/antunit/antlib.xml
+++ b/src/main/org/apache/ant/antunit/antlib.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/junit3/AntUnitSuite.java b/src/main/org/apache/ant/antunit/junit3/AntUnitSuite.java
index ac7717a..74fe3dc 100644
--- a/src/main/org/apache/ant/antunit/junit3/AntUnitSuite.java
+++ b/src/main/org/apache/ant/antunit/junit3/AntUnitSuite.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/junit3/AntUnitTestCase.java b/src/main/org/apache/ant/antunit/junit3/AntUnitTestCase.java
index 5766b44..3442ddf 100644
--- a/src/main/org/apache/ant/antunit/junit3/AntUnitTestCase.java
+++ b/src/main/org/apache/ant/antunit/junit3/AntUnitTestCase.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/junit3/ErrorTestCase.java b/src/main/org/apache/ant/antunit/junit3/ErrorTestCase.java
index 3d528a4..d683b19 100644
--- a/src/main/org/apache/ant/antunit/junit3/ErrorTestCase.java
+++ b/src/main/org/apache/ant/antunit/junit3/ErrorTestCase.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/junit3/JUnitNotificationAdapter.java b/src/main/org/apache/ant/antunit/junit3/JUnitNotificationAdapter.java
index 1c315c1..4b09202 100644
--- a/src/main/org/apache/ant/antunit/junit3/JUnitNotificationAdapter.java
+++ b/src/main/org/apache/ant/antunit/junit3/JUnitNotificationAdapter.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/junit3/MultiProjectDemuxOutputStream.java b/src/main/org/apache/ant/antunit/junit3/MultiProjectDemuxOutputStream.java
index 5bb5db2..f73cf2a 100644
--- a/src/main/org/apache/ant/antunit/junit3/MultiProjectDemuxOutputStream.java
+++ b/src/main/org/apache/ant/antunit/junit3/MultiProjectDemuxOutputStream.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/junit3/package.html b/src/main/org/apache/ant/antunit/junit3/package.html
index cd365ae..21b7470 100644
--- a/src/main/org/apache/ant/antunit/junit3/package.html
+++ b/src/main/org/apache/ant/antunit/junit3/package.html
@@ -8,7 +8,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/antunit/junit4/AntUnitSuiteRunner.java b/src/main/org/apache/ant/antunit/junit4/AntUnitSuiteRunner.java
index e52485b..e3d69d4 100644
--- a/src/main/org/apache/ant/antunit/junit4/AntUnitSuiteRunner.java
+++ b/src/main/org/apache/ant/antunit/junit4/AntUnitSuiteRunner.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/junit4/package.html b/src/main/org/apache/ant/antunit/junit4/package.html
index 931f3b2..36ccffc 100644
--- a/src/main/org/apache/ant/antunit/junit4/package.html
+++ b/src/main/org/apache/ant/antunit/junit4/package.html
@@ -8,7 +8,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/antunit/listener/BaseAntUnitListener.java b/src/main/org/apache/ant/antunit/listener/BaseAntUnitListener.java
index ac6c510..c55216a 100644
--- a/src/main/org/apache/ant/antunit/listener/BaseAntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/listener/BaseAntUnitListener.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/listener/FailureAntUnitListener.java b/src/main/org/apache/ant/antunit/listener/FailureAntUnitListener.java
index 6653fa5..a26d01e 100644
--- a/src/main/org/apache/ant/antunit/listener/FailureAntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/listener/FailureAntUnitListener.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/listener/LogForwarder.java b/src/main/org/apache/ant/antunit/listener/LogForwarder.java
index 6a73323..08d0d6b 100644
--- a/src/main/org/apache/ant/antunit/listener/LogForwarder.java
+++ b/src/main/org/apache/ant/antunit/listener/LogForwarder.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/listener/PlainAntUnitListener.java b/src/main/org/apache/ant/antunit/listener/PlainAntUnitListener.java
index 906b3db..980055e 100644
--- a/src/main/org/apache/ant/antunit/listener/PlainAntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/listener/PlainAntUnitListener.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/listener/XMLAntUnitListener.java b/src/main/org/apache/ant/antunit/listener/XMLAntUnitListener.java
index 2b57f01..23eddae 100644
--- a/src/main/org/apache/ant/antunit/listener/XMLAntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/listener/XMLAntUnitListener.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/antunit/listener/XMLConstants.java b/src/main/org/apache/ant/antunit/listener/XMLConstants.java
index 52ce4ae..075175d 100644
--- a/src/main/org/apache/ant/antunit/listener/XMLConstants.java
+++ b/src/main/org/apache/ant/antunit/listener/XMLConstants.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml
index dd0f144..e73508c 100644
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/assertLogContains-test.xml b/src/tests/antunit/assertLogContains-test.xml
index 6d84e4e..f7536e5 100644
--- a/src/tests/antunit/assertLogContains-test.xml
+++ b/src/tests/antunit/assertLogContains-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/assertResourceContains-test.xml b/src/tests/antunit/assertResourceContains-test.xml
index 4892625..ac2508c 100644
--- a/src/tests/antunit/assertResourceContains-test.xml
+++ b/src/tests/antunit/assertResourceContains-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/assertResourceExists-test.xml b/src/tests/antunit/assertResourceExists-test.xml
index ce15bf7..2cbe3ba 100644
--- a/src/tests/antunit/assertResourceExists-test.xml
+++ b/src/tests/antunit/assertResourceExists-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/resourceexists-test.xml b/src/tests/antunit/resourceexists-test.xml
index a2360c4..41b4c4c 100644
--- a/src/tests/antunit/resourceexists-test.xml
+++ b/src/tests/antunit/resourceexists-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java b/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
index 11d5b6f..365b2d6 100644
--- a/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/AssertTest.java b/src/tests/junit/org/apache/ant/antunit/AssertTest.java
index bd91e18..9e2ac1b 100644
--- a/src/tests/junit/org/apache/ant/antunit/AssertTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/AssertTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/ExpectFailureTest.java b/src/tests/junit/org/apache/ant/antunit/ExpectFailureTest.java
index 8467448..4354c10 100644
--- a/src/tests/junit/org/apache/ant/antunit/ExpectFailureTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/ExpectFailureTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/LogCapturerTest.java b/src/tests/junit/org/apache/ant/antunit/LogCapturerTest.java
index 7825b63..4674478 100644
--- a/src/tests/junit/org/apache/ant/antunit/LogCapturerTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/LogCapturerTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/LogContentTest.java b/src/tests/junit/org/apache/ant/antunit/LogContentTest.java
index 942773d..5c3aae8 100644
--- a/src/tests/junit/org/apache/ant/antunit/LogContentTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/LogContentTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java b/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
index 472214c..8c79740 100644
--- a/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitSuiteTest.java b/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitSuiteTest.java
index 71f2a3e..77a3f35 100644
--- a/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitSuiteTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitSuiteTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitTestCaseTest.java b/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitTestCaseTest.java
index 6ec361c..ab51025 100644
--- a/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitTestCaseTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/junit3/AntUnitTestCaseTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/junit3/EatYourOwnDogFoodTest.java b/src/tests/junit/org/apache/ant/antunit/junit3/EatYourOwnDogFoodTest.java
index 27d0f0c..01ab830 100644
--- a/src/tests/junit/org/apache/ant/antunit/junit3/EatYourOwnDogFoodTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/junit3/EatYourOwnDogFoodTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/junit4/AntUnitSuiteRunnerTest.java b/src/tests/junit/org/apache/ant/antunit/junit4/AntUnitSuiteRunnerTest.java
index 782891b..73dd8ec 100644
--- a/src/tests/junit/org/apache/ant/antunit/junit4/AntUnitSuiteRunnerTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/junit4/AntUnitSuiteRunnerTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/listener/LogForwarderTest.java b/src/tests/junit/org/apache/ant/antunit/listener/LogForwarderTest.java
index d44035a..900e183 100644
--- a/src/tests/junit/org/apache/ant/antunit/listener/LogForwarderTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/listener/LogForwarderTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/listener/PlainListenerTest.java b/src/tests/junit/org/apache/ant/antunit/listener/PlainListenerTest.java
index 57de373..80d8ce6 100644
--- a/src/tests/junit/org/apache/ant/antunit/listener/PlainListenerTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/listener/PlainListenerTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/src/tests/junit/org/apache/ant/antunit/listener/XMLListenerTest.java b/src/tests/junit/org/apache/ant/antunit/listener/XMLListenerTest.java
index 359d7bf..74dfee6 100644
--- a/src/tests/junit/org/apache/ant/antunit/listener/XMLListenerTest.java
+++ b/src/tests/junit/org/apache/ant/antunit/listener/XMLListenerTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
diff --git a/version.properties b/version.properties
index 6f22f94..d186e98 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 #  (the "License"); you may not use this file except in compliance with
 #  the License.  You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,