remove unnecessary http references in xml / xsl testcases

jmkf · jmkf · commit 3d515b284194 · 2019-05-25T19:02:57.000+02:00
diff --git a/src/etc/testcases/taskdefs/conditions/http.xml b/src/etc/testcases/taskdefs/conditions/http.xml
@@ -23,34 +23,34 @@
 
   <target name="basic-no-method">
       <condition property="basic-no-method">
-          <http url="http://ant.apache.org/"/>
+          <http url="https://ant.apache.org/"/>
       </condition>
       <condition property="basic-no-method-bad-url">
-          <http url="http://ant.apache.org/this-page-does-not-exist"/>
+          <http url="https://ant.apache.org/this-page-does-not-exist"/>
       </condition>
   </target>
 
   <target name="test-head-request">
       <condition property="test-head-request">
-          <http url="http://ant.apache.org/" requestMethod="HEAD"/>
+          <http url="https://ant.apache.org/" requestMethod="HEAD"/>
       </condition>
       <condition property="test-head-request-bad-url">
-          <http url="http://ant.apache.org/this-page-does-not-exist" requestMethod="HEAD"/>
+          <http url="https://ant.apache.org/this-page-does-not-exist" requestMethod="HEAD"/>
       </condition>
   </target>
 
   <target name="test-get-request">
       <condition property="test-get-request">
-          <http url="http://ant.apache.org/" requestMethod="GET"/>
+          <http url="https://ant.apache.org/" requestMethod="GET"/>
       </condition>
       <condition property="test-get-request-bad-url">
-          <http url="http://ant.apache.org/this-page-does-not-exist" requestMethod="GET"/>
+          <http url="https://ant.apache.org/this-page-does-not-exist" requestMethod="GET"/>
       </condition>
   </target>
 
   <target name="bad-request-method">
       <condition property="bad-request-method">
-          <http url="http://ant.apache.org" requestMethod="UNKNOWN"/>
+          <http url="https://ant.apache.org" requestMethod="UNKNOWN"/>
       </condition>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/get.xml b/src/etc/testcases/taskdefs/get.xml
@@ -35,11 +35,11 @@
   </target>
 
   <target name="test5">
-    <get src="http://www.apache.org/" dest=""/>
+    <get src="https://www.apache.org/" dest=""/>
   </target>
 
   <target name="test6">
-    <get src="http://www.apache.org/" dest="get.tmp" userAgent="Apache Ant/test"/>
+    <get src="https://www.apache.org/" dest="get.tmp" userAgent="Apache Ant/test"/>
 
     <fileset id="t6" file="get.tmp" />
     <pathconvert property="t6" refid="t6" setonempty="false" />
@@ -80,7 +80,7 @@
 
     <touch file="get.tmp" datetime="${dt}" pattern="${pat}" />
 
-    <get src="http://www.w3.org/MarkUp" dest="get.tmp"
+    <get src="https://www.w3.org/MarkUp" dest="get.tmp"
          usetimestamp="true" verbose="true" />
 
     <fileset id="ts" file="get.tmp">
@@ -99,29 +99,29 @@
   </target>
 
   <target name="testTwoHeadersAreAddedOK">
-    <get src="http://www.apache.org/" dest="get.tmp">
+    <get src="https://www.apache.org/" dest="get.tmp">
       <header name="header1" value="header1Value"/>
       <header name="header2" value="header2Value"/>
     </get>
   </target>
 
   <target name="testEmptyHeadersAreNeverAdded">
-    <get src="http://www.apache.org/" dest="get.tmp">
+    <get src="https://www.apache.org/" dest="get.tmp">
       <header name="" value="headerValue"/>
       <header name="header2" value=""/>
     </get>
   </target>
 
   <target name="testThatWhenMoreThanOneHeaderHaveSameNameOnlyLastOneIsAdded">
-    <get src="http://www.apache.org/" dest="get.tmp">
+    <get src="https://www.apache.org/" dest="get.tmp">
       <header name="header1" value="headerValue1"/>
       <header name="header1" value="headerValue2"/>
       <header name="header1" value="headerValue3"/>
     </get>
   </target>
 
   <target name="testHeaderSpaceTrimmed">
-    <get src="http://www.apache.org/" dest="get.tmp">
+    <get src="https://www.apache.org/" dest="get.tmp">
       <header name="  header1     " value="  headerValue1  "/>
     </get>
   </target>
diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
@@ -269,7 +269,7 @@
     <jar destfile="${tmp.jar}" basedir="${tmp.dir}" strict="warn"/>
   </target>  
     
-  <!-- see http://java.sun.com/j2se/1.3/docs/guide/versioning/spec/VersioningSpecification.html#PackageVersioning -->  
+  <!-- see https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html -->  
   <target name="testHasVersionInfo">
     <mkdir dir="${tmp.dir}"/>
     <jar destfile="${tmp.jar}" basedir="${tmp.dir}" strict="fail">
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
@@ -696,7 +696,7 @@ h6 {
     <table width="100%">
     <tr>
         <td align="left"></td>
-        <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
+        <td align="right">Designed for use with <a href="https://www.junit.org/">JUnit</a> and <a href="https://ant.apache.org/">Ant</a>.</td>
     </tr>
     </table>
     <hr size="1"/>
diff --git 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 {
     <table width="100%">
     <tr>
         <td align="left"></td>
-        <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
+        <td align="right">Designed for use with <a href="https://www.junit.org/">JUnit</a> and <a href="https://ant.apache.org/">Ant</a>.</td>
     </tr>
     </table>
     <hr size="1"/>
diff --git a/src/etc/testcases/taskdefs/signjar.xml b/src/etc/testcases/taskdefs/signjar.xml
@@ -80,7 +80,7 @@
   </target>
 
   <target name="urlKeystoreHTTP" depends="jar">
-    <sign keystore="http://ant.apache.org/webtest/testkeystore"/>
+    <sign keystore="https://ant.apache.org/webtest/testkeystore"/>
     <assertSigned/>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/touch.xml b/src/etc/testcases/taskdefs/touch.xml
@@ -45,8 +45,8 @@
     <!-- this one is about 21 years after the epoch -->
     <!-- less than 20 years after the epoch, test does not pass on my Win2K/FAT -->
     <!-- Antoine February 8, 2004 -->
-    <!-- see http://developer.java.sun.com/developer/bugParade/bugs/4177432.html -->
-    <!-- and http://developer.java.sun.com/developer/bugParade/bugs/4697792.html -->
+    <!-- see https://bugs.openjdk.java.net/browse/JDK-4177432 -->
+    <!-- and https://bugs.openjdk.java.net/browse/JDK-4697792 -->
     <!-- not sure why -->
     <touch file="touchtest" millis="662256000000" />
   </target>
diff --git 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 {
     <javac srcdir="${input}" destdir="${output}"/>
     <taskdef name="x" classname="org.example.Task"
              classpath="${output}"/>
-    <url url="http://ant.apache.org/" id="anturl"/>
+    <url url="https://ant.apache.org/" id="anturl"/>
     <x attr="${ant.refid:anturl}"/>
-    <au:assertLogContains text="URL is: http://ant.apache.org/"/>
+    <au:assertLogContains text="URL is: https://ant.apache.org/"/>
   </target>
 </project>
diff --git a/src/tests/antunit/junit-frames.xsl b/src/tests/antunit/junit-frames.xsl
@@ -695,7 +695,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"/>
diff --git a/src/tests/antunit/junit-noframes.xsl b/src/tests/antunit/junit-noframes.xsl
@@ -318,7 +318,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"/>
diff --git a/src/tests/antunit/taskdefs/bunzip2-test.xml b/src/tests/antunit/taskdefs/bunzip2-test.xml
@@ -30,19 +30,19 @@
 
   <target name="testWithNonFileResourceToFile" depends="setup">
     <bunzip2 dest="${output}/greeting.txt">
-      <url url="http://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
+      <url url="https://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
     </bunzip2>
-    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+    <get src="https://ant.apache.org/webtest/gunzip/greeting.txt"
          dest="${output}/orig.greeting.txt"/>
     <au:assertFilesMatch expected="${output}/orig.greeting.txt"
                          actual="${output}/greeting.txt"/>
   </target>
 
   <target name="testWithNonFileResourceToDir" depends="setup">
     <bunzip2 dest="${output}">
-      <url url="http://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
+      <url url="https://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
     </bunzip2>
-    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+    <get src="https://ant.apache.org/webtest/gunzip/greeting.txt"
          dest="${output}/orig.greeting.txt"/>
     <au:assertFilesMatch expected="${output}/orig.greeting.txt"
                          actual="${output}/greeting.txt"/>
diff --git a/src/tests/antunit/taskdefs/condition/resourceexists-test.xml b/src/tests/antunit/taskdefs/condition/resourceexists-test.xml
@@ -39,7 +39,7 @@
   <target name="testURL">
     <au:assertTrue>
       <cond:resourceexists>
-        <url url="http://ant.apache.org/index.html"/>
+        <url url="https://ant.apache.org/index.html"/>
       </cond:resourceexists>
     </au:assertTrue>
   </target>
diff --git 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 {
     <au:expectfailure>
       <copy todir="${output}" failonerror="true" flatten="true">
         <resources>
-          <url url="http://i-do-not-exist/"/>
+          <url url="https://i-do-not-exist/"/>
         </resources>
       </copy>
     </au:expectfailure>
diff --git a/src/tests/antunit/taskdefs/get-test.xml b/src/tests/antunit/taskdefs/get-test.xml
@@ -19,7 +19,7 @@
 <project name="get-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
   <import file="../antunit-base.xml" />
 
-  <property name="location" value="http://ant.apache.org/webtest/gettest" />
+  <property name="location" value="https://ant.apache.org/webtest/gettest" />
 
   <target name="setUp">
     <mkdir dir="${output}" />
@@ -103,8 +103,8 @@
 
     <target name="testNestedResources">
       <get dest="${output}/downloads">
-        <url url="http://ant.apache.org/index.html"/> 
-        <url url="http://ant.apache.org/faq.html"/>
+        <url url="https://ant.apache.org/index.html"/> 
+        <url url="https://ant.apache.org/faq.html"/>
       </get>
       <au:assertFileExists file="${output}/downloads/index.html"/>
       <au:assertFileExists file="${output}/downloads/faq.html"/>
diff --git a/src/tests/antunit/taskdefs/gunzip-test.xml b/src/tests/antunit/taskdefs/gunzip-test.xml
@@ -40,19 +40,19 @@
 
   <target name="testWithNonFileResourceToFile" depends="setup">
     <gunzip dest="${output}/greeting.txt">
-      <url url="http://ant.apache.org/webtest/gunzip/greeting.txt.gz"/>
+      <url url="https://ant.apache.org/webtest/gunzip/greeting.txt.gz"/>
     </gunzip>
-    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+    <get src="https://ant.apache.org/webtest/gunzip/greeting.txt"
          dest="${output}/orig.greeting.txt"/>
     <au:assertFilesMatch expected="${output}/orig.greeting.txt"
                          actual="${output}/greeting.txt"/>
   </target>
 
   <target name="testWithNonFileResourceToDir" depends="setup">
     <gunzip dest="${output}">
-      <url url="http://ant.apache.org/webtest/gunzip/greeting.txt.gz"/>
+      <url url="https://ant.apache.org/webtest/gunzip/greeting.txt.gz"/>
     </gunzip>
-    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+    <get src="https://ant.apache.org/webtest/gunzip/greeting.txt"
          dest="${output}/orig.greeting.txt"/>
     <au:assertFilesMatch expected="${output}/orig.greeting.txt"
                          actual="${output}/greeting.txt"/>
diff --git 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"/>
   </target>
 
-  <target name="multiReleaseJarPart1" description="http://openjdk.java.net/jeps/238">
+  <target name="multiReleaseJarPart1" description="https://openjdk.java.net/jeps/238">
     <!-- Preparation of the 'MultiRelease-Project' -->
     <property name="java8.src"  value="${input}/src/java"/>
     <property name="java9.src"  value="${input}/src/java9"/>
diff --git a/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml b/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
@@ -41,19 +41,19 @@
 
   <target name="testWithNonFileResourceToFile" depends="setup" if="xz.present">
     <unxz dest="${output}/greeting.txt">
-      <url url="http://ant.apache.org/webtest/xz/greeting.txt.xz"/>
+      <url url="https://ant.apache.org/webtest/xz/greeting.txt.xz"/>
     </unxz>
-    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+    <get src="https://ant.apache.org/webtest/gunzip/greeting.txt"
          dest="${output}/orig.greeting.txt"/>
     <au:assertFilesMatch expected="${output}/orig.greeting.txt"
                          actual="${output}/greeting.txt"/>
   </target>
 
   <target name="testWithNonFileResourceToDir" depends="setup" if="xz.present">
     <unxz dest="${output}">
-      <url url="http://ant.apache.org/webtest/xz/greeting.txt.xz"/>
+      <url url="https://ant.apache.org/webtest/xz/greeting.txt.xz"/>
     </unxz>
-    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+    <get src="https://ant.apache.org/webtest/gunzip/greeting.txt"
          dest="${output}/orig.greeting.txt"/>
     <au:assertFilesMatch expected="${output}/orig.greeting.txt"
                          actual="${output}/greeting.txt"/>
diff --git a/src/tests/antunit/taskdefs/property-test.xml b/src/tests/antunit/taskdefs/property-test.xml
@@ -154,7 +154,7 @@ b=$${a}
   <!-- 
   Problems with @-sign discussed on the mailinglist.
   Seems to work.
-  http://mail-archives.apache.org/mod_mbox/ant-user/201412.mbox/%3CCAPxjwW%2BQKFFj45O-ZbCGOnAkJXe9KJ5qKtVQCvS2x7hObRJmkQ%40mail.gmail.com%3E
+  https://mail-archives.apache.org/mod_mbox/ant-user/201412.mbox/%3CCAPxjwW%2BQKFFj45O-ZbCGOnAkJXe9KJ5qKtVQCvS2x7hObRJmkQ%40mail.gmail.com%3E
   -->
   <target name="testAtSign">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/taskdefs/retry-test.xml b/src/tests/antunit/taskdefs/retry-test.xml
@@ -26,7 +26,7 @@
 
   <target name="test-fail-and-retry" depends="setUp">
     <!-- just in case this ever becomes a legit url... -->
-    <property name="src" value="http://iojasodjojaosdj"/>
+    <property name="src" value="https://iojasodjojaosdj"/>
     <au:expectfailure expectedmessage="Task [get] failed after [${i}] attempts; giving up">
       <retry retrycount="${i}">
         <get src="${src}" dest="${dest}"/>
diff --git a/src/tests/antunit/types/resources/selectors/test-componentdef.xml b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
@@ -81,7 +81,7 @@
         <restrict>
           <resources>
             <file file="foo" />
-            <url url="http://ant.apache.org/index.html" />
+            <url url="https://ant.apache.org/index.html" />
             <resource name="foo" />
             <string value="foo" />
             <file file="bar" />
diff --git a/src/tests/antunit/types/resources/selectors/test.xml b/src/tests/antunit/types/resources/selectors/test.xml
@@ -85,7 +85,7 @@
         <restrict>
           <resources>
             <file file="foo" />
-            <url url="http://ant.apache.org/index.html" />
+            <url url="https://ant.apache.org/index.html" />
             <resource name="foo" />
             <string value="foo" />
             <file file="bar" />
diff --git a/src/tests/antunit/types/resources/test.xml b/src/tests/antunit/types/resources/test.xml
@@ -28,8 +28,8 @@
   <condition property="offline">
     <not>
       <or>
-        <http url="http://www.apache.org"/>
-        <http url="http://www.google.com"/>
+        <http url="https://www.apache.org"/>
+        <http url="https://www.google.com"/>
       </or>
     </not>
   </condition>
@@ -280,7 +280,7 @@
 
   <target name="testhttpurl2" unless="offline">
     <concat destfile="${file}" force="true" append="false">
-      <url id="httpurl" url="http://ant.apache.org/index.html" />
+      <url id="httpurl" url="https://ant.apache.org/index.html" />
       <url refid="httpurl" />
     </concat>
     <length property="httpurl.length">
