diff --git a/docs/archive.html b/docs/archive.html
index 1755a47..c34c0dc 100644
--- a/docs/archive.html
+++ b/docs/archive.html
@@ -74,7 +74,7 @@
       <td valign="top">encoding</td>
       <td valign="top">The character encoding to use for filenames
         inside the archive.  For a list of possible values
-        see <a href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.
+        see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.
         The magic value
         <code>native-encoding</code> can be used to explicitly select
         the platform's default character encoding.  Defaults to the
diff --git a/docs/compresource.html b/docs/compresource.html
index 404f8fa..38b40cc 100644
--- a/docs/compresource.html
+++ b/docs/compresource.html
@@ -209,7 +209,7 @@
 <h2><a name="pack200resource">pack200resource</a></h2>
 
 <p>This is a <a href="#compresource">compressed resource</a> using the
-  <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.html">Pack200</a>
+  <a href="https://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.html">Pack200</a>
   compression.</p>
 
 <h4>Examples</h4>
diff --git a/docs/expand.html b/docs/expand.html
index d5ebe35..069fc3f 100644
--- a/docs/expand.html
+++ b/docs/expand.html
@@ -139,7 +139,7 @@
     <td valign="top">
     The character encoding that has been used for filenames
     inside the arj file.  For a list of possible values see <a
-    href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+    href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
     Defaults <code>native-encoding</code> which is the magic value for
     the platform's default character encoding.<br/>
     <em>since Compress Antlib 1.3</em></td>
@@ -165,7 +165,7 @@
     <td valign="top">
     The character encoding that has been used for filenames
     inside the cpio file.  For a list of possible values see <a
-    href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+    href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
     Defaults <code>native-encoding</code> which is the magic value for
     the platform's default character encoding.<br/>
     <em>since Compress Antlib 1.3</em></td>
@@ -193,7 +193,7 @@
     <td valign="top">
     The character encoding that has been used for filenames
     inside the dump file.  For a list of possible values see <a
-    href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+    href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
     Defaults <code>native-encoding</code> which is the magic value for
     the platform's default character encoding.<br/>
     <em>since Compress Antlib 1.3</em></td>
@@ -219,7 +219,7 @@
     <td valign="top">
     The character encoding that has been used for filenames
     inside the tar file.  For a list of possible values see <a
-    href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+    href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
     Defaults <code>native-encoding</code> which is the magic value for
     the platform's default character encoding.<br/>
     <em>since Compress Antlib 1.2</em></td>
@@ -264,7 +264,7 @@
     <td valign="top">
     The character encoding that has been used for filenames
     inside the zip file.  For a list of possible values see <a
-    href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+    href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
     Defaults to &quot;UTF8&quot;, use the magic value
     <code>native-encoding</code> for the platform's default character
     encoding.
diff --git a/docs/fileset.html b/docs/fileset.html
index 1c20ae0..cc94c5d 100644
--- a/docs/fileset.html
+++ b/docs/fileset.html
@@ -197,8 +197,7 @@
       <td valign="top">encoding</td>
       <td valign="top">
         The character encoding that has been used for filenames
-        inside the arj file.  For a list of possible values see <a
-                                                                   href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+        inside the arj file.  For a list of possible values see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
         Defaults <code>native-encoding</code> which is the magic value for
         the platform's default character encoding.<br/>
         <em>since Compress Antlib 1.3</em></td>
@@ -256,7 +255,7 @@
       <td valign="top">
         The character encoding that has been used for filenames
         inside the cpio file.  For a list of possible values see <a
-                                                                   href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+                                                                   href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
         Defaults <code>native-encoding</code> which is the magic value for
         the platform's default character encoding.<br/>
         <em>since Compress Antlib 1.3</em></td>
@@ -316,7 +315,7 @@
       <td valign="top">
         The character encoding that has been used for filenames
         inside the dump file.  For a list of possible values see <a
-                                                                   href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+                                                                   href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
         Defaults <code>native-encoding</code> which is the magic value for
         the platform's default character encoding.<br/>
         <em>since Compress Antlib 1.3</em></td>
@@ -393,7 +392,7 @@
       <td valign="top">
         The character encoding that has been used for filenames
         inside the tar file.  For a list of possible values see <a
-                                                                   href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+                                                                   href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.<br>
         Defaults <code>native-encoding</code> which is the magic value for
         the platform's default character encoding.<br/>
         <em>since Compress Antlib 1.2</em></td>
@@ -409,7 +408,7 @@
     &lt;cmp:tarfileset xmlns:cmp="antlib:org.apache.ant.compress"
         includes="lib/**"&gt;
       &lt;cmp:bzip2resource&gt;
-        &lt;url url="http://example.org/dist/some-archive.tar.bz2"/&gt;
+        &lt;url url="https://example.org/dist/some-archive.tar.bz2"/&gt;
       &lt;/cmp:bzip2resource&gt;
     &lt;/cmp:tarfileset&gt;
   &lt;/copy&gt;
@@ -441,7 +440,7 @@
       <td valign="top">encoding</td>
       <td valign="top">The character encoding to use for filenames
       inside the zip file.  For a list of possible values see <a
-      href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.
+      href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html</a>.
         Defaults to the platform's default character encoding.</td>
       <td align="center" valign="top">No</td>
     </tr>
diff --git a/docs/pack.html b/docs/pack.html
index 285dc46..cf20f9d 100644
--- a/docs/pack.html
+++ b/docs/pack.html
@@ -188,7 +188,7 @@
   <h3><a name="pack200">Pack200</a></h3>
 
   <p>Is a <a href="#pack">compressing task</a> that uses
-    the <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.html">Pack200</a>
+    the <a href="https://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.html">Pack200</a>
     compression algorithm.</p>
 
   <p>The source of this task must be a valid JAR archive.</p>
@@ -296,10 +296,10 @@
 </pre>
   <pre>
     &lt;cmp:gzip destfile=&quot;archive.tar.gz&quot; xmlns:cmp="antlib:org.apache.ant.compress"&gt;
-      &lt;url url="http://example.org/archive.tar"/&gt;
+      &lt;url url="https://example.org/archive.tar"/&gt;
     &lt;/cmp:gzip&gt;
 </pre>
-  <p>downloads <i>http://example.org/archive.tar</i> and compresses it
+  <p>downloads <i>https://example.org/archive.tar</i> and compresses it
     to <i>archive.tar.gz</i> in the project's basedir on the fly.</p>
 
   <pre>
diff --git a/docs/pack200normalize.html b/docs/pack200normalize.html
index 2b05def..8072416 100644
--- a/docs/pack200normalize.html
+++ b/docs/pack200normalize.html
@@ -33,7 +33,7 @@
     packing and unpacking it again so that any signature applied to
     the "normalized" JAR will stay valid during another pack/unpack
     cycle.
-    See <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.Packer.html">Pack200.Packer's
+    See <a href="https://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.Packer.html">Pack200.Packer's
     javadocs</a> for more details.</p>
 
   <p>This task can be used to normalize a JAR in-place or to create a
diff --git a/docs/unpack.html b/docs/unpack.html
index d71a1ec..89ff447 100644
--- a/docs/unpack.html
+++ b/docs/unpack.html
@@ -290,10 +290,10 @@
 subdir is a directory).</p>
 <blockquote><pre>
 &lt;cmp:gunzip dest=&quot;.&quot; xmlns:cmp="antlib:org.apache.ant.compress"&gt;
-  &lt;url url="http://example.org/archive.tar.gz"/&gt;
+  &lt;url url="https://example.org/archive.tar.gz"/&gt;
 &lt;/cmp:gunzip&gt;
 </pre></blockquote>
-<p>downloads <i>http://example.org/archive.tar.gz</i> and expands it
+<p>downloads <i>https://example.org/archive.tar.gz</i> and expands it
 to <i>archive.tar</i> in the project's basedir on the fly.</p>
 <blockquote><pre>
 &lt;cmp:unpack200 dest=&quot;foo.jar&quot; xmlns:cmp="antlib:org.apache.ant.compress"&gt;
diff --git a/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java b/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java
index 06a0f89..63d2179 100644
--- a/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java
+++ b/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java
@@ -36,7 +36,7 @@
  * will still be valid after a pack200/unpack200 cycle.
  *
  * <p>As stated in <a
- * href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.Packer.html">Pack200.Packer's</a>
+ * href="https://download.oracle.com/javase/1.5.0/docs/api/java/util/jar/Pack200.Packer.html">Pack200.Packer's</a>
  * javadocs applying a Pack200 compression to a JAR archive will in
  * general make its sigantures invalid.  In order to prepare a JAR for
  * signing it should be "normalized" by packing and unpacking it.
diff --git a/src/main/org/apache/ant/compress/util/LZ4StreamFactory.java b/src/main/org/apache/ant/compress/util/LZ4StreamFactory.java
index 289ae5d..96d0c59 100644
--- a/src/main/org/apache/ant/compress/util/LZ4StreamFactory.java
+++ b/src/main/org/apache/ant/compress/util/LZ4StreamFactory.java
@@ -32,7 +32,7 @@
 /**
  * Creates streams for LZ4 format.
  * @since Apache Compress Antlib 1.5
- * @see <a href="http://lz4.github.io/lz4/">LZ4 Project</a>
+ * @see <a href="https://lz4.github.io/lz4/">LZ4 Project</a>
  */
 public class LZ4StreamFactory implements CompressorWithConcatenatedStreamsFactory {
 
diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml
index b133be3..84c4749 100644
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@ -67,7 +67,7 @@
          (in which case the pattern including the timezone is
          required).
          The change in OpenJDK is
-         http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/90df6756406f
+         https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/90df6756406f
          -->
     <condition property="zip-uses-extra-field">
       <cond:islastmodified datetime="2001-11-19-15:34:20 +0100"