Merge branch 'master' of https://gitbox.apache.org/repos/asf/ant-antlibs-antunit

README

@@ -11,7 +11,7 @@ Learn more
 
 The documentation is included in the docs subdirectory of this
 distribution.  The home of this library is
-<http://ant.apache.org/antlibs/antunit/index.html>.
+<https://ant.apache.org/antlibs/antunit/index.html>.
 
 Building
 ========

common

@@ -1 +1 @@
-Subproject commit 0a4d3650f72e8ec0a27f2f9e41287d96c23136b2
+Subproject commit a715465514e3aaa5e6e06a91345c0292c3642539

docs/antunit.html

@@ -210,7 +210,7 @@ public class LogCapturer {
     <a name="referenceset"/><h4>referenceset</h4>
 
     <p>References can be grouped inside a &lt;referenceset&gt; element for clarity.  Additionally, &lt;referenceset&gt;
-    elements may contain exactly one nested <a href="http://ant.apache.org/manual/CoreTypes/mapper.html">&lt;mapper&gt;</a> 
+    elements may contain exactly one nested <a href="https://ant.apache.org/manual/CoreTypes/mapper.html">&lt;mapper&gt;</a> 
     element, which defines how source reference IDs are translated into target reference IDs.  For example,
 
 <pre>

ivy.xml

@@ -25,8 +25,8 @@
     <license name="Apache Software License 2.0"
              url="https://www.apache.org/licenses/LICENSE-2.0"/>
     <ivyauthor name="Apache Ant Development Team"
-               url="http://ant.apache.org/"/>
+               url="https://ant.apache.org/"/>
-    <description homepage="http://ant.apache.org/antlibs/antunit/">
+    <description homepage="https://ant.apache.org/antlibs/antunit/">
       This library contains tasks that enables Ant task developers to test
       their tasks with Ant and without JUnit.  It contains a few assertion
       tasks and an antunit task that runs build files instead of test

prepare.xml

@@ -27,7 +27,7 @@ The original of this snippet is maintained in the antlib-common project.
 
   <!-- Which released version of AntUnit to use, where to download, where to store. -->
   <property name="antunit.version" value="1.3"/>
-  <property name="antunit.url" value="http://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
+  <property name="antunit.url" value="https://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
   <property name="antunit.file" value="ant-antunit.jar"/>
 
   <!-- Skip unnecessary tasks. -->

project-template.pom

@@ -17,7 +17,7 @@
 <!--
    This POM has been created manually by the Ant Development Team. Please
    contact us if you are not satisfied with the data contained in this
-   POM . URL : http://ant.apache.org
+   POM . URL : https://ant.apache.org
   -->
 <project>
   <modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@
   </licenses>
   <organization>
     <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
+    <url>https://www.apache.org/</url>
   </organization>
 
   <!--

src/etc/junit-frames.xsl

@@ -709,7 +709,7 @@ h6 {
     <table width="100%">
     <tr>
         <td align="left"></td>
-        <td align="right">Designed for use with <a href="http://ant.apache.org/antlibs/antunit/">AntUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
+        <td align="right">Designed for use with <a href="https://ant.apache.org/antlibs/antunit/">AntUnit</a> and <a href="https://ant.apache.org/">Ant</a>.</td>
     </tr>
     </table>
     <hr size="1"/>

src/etc/junit-noframes.xsl

@@ -317,7 +317,7 @@ under the License.
     <table width="100%">
     <tr>
         <td align="left"></td>
-        <td align="right">Designed for use with <a href='http://ant.apache.org/antlibs/antunit/'>AntUnit</a> and <a href='http://ant.apache.org/'>Ant</a>.</td>
+        <td align="right">Designed for use with <a href='https://ant.apache.org/antlibs/antunit/'>AntUnit</a> and <a href='https://ant.apache.org/'>Ant</a>.</td>
     </tr>
     </table>
     <hr size="1"/>

src/etc/testcases/antunit.xml

@@ -43,7 +43,7 @@ under the License.
 
   <target name="nonFile">
     <au:antunit>
-      <url url="http://ant.apache.org/"/>
+      <url url="https://ant.apache.org/"/>
     </au:antunit>
   </target>
 

src/tests/antunit/assertResourceContains-test.xml

@@ -19,7 +19,7 @@
 
   <import file="antunit-base.xml"/>
 
-  <url url="http://ant.apache.org/index.html" id="antsite"/>
+  <url url="https://ant.apache.org/index.html" id="antsite"/>
 
   <target name="testURLUsingRef"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53383">

src/tests/antunit/assertResourceExists-test.xml

@@ -19,8 +19,8 @@
 
   <import file="antunit-base.xml"/>
 
-  <property name="existing-url" value="http://ant.apache.org/index.html"/>
+  <property name="existing-url" value="https://ant.apache.org/index.html"/>
-  <property name="not-existing-url" value="http://ant.apache.org/foo.html"/>
+  <property name="not-existing-url" value="https://ant.apache.org/foo.html"/>
 
   <!-- some strange proxy setups hide the 404 results -->
   <target name="-checkWhetherUrlsThatDontExistAreFound">

src/tests/antunit/resourceexists-test.xml

@@ -52,13 +52,13 @@
   <target name="testURL">
     <au:assertTrue>
       <au:resourceExists>
-        <url url="http://ant.apache.org/index.html"/>
+        <url url="https://ant.apache.org/index.html"/>
       </au:resourceExists>
     </au:assertTrue>
   </target>
 
   <target name="testURLAttributeUsingRef">
-    <url url="http://ant.apache.org/index.html" id="antsite"/>
+    <url url="https://ant.apache.org/index.html" id="antsite"/>
     <au:assertTrue>
       <au:resourceExists resource="${ant.refid:antsite}"/>
     </au:assertTrue>