removed http links from java sources to the extent possible

58 files changed, 97 insertions, 106 deletions

diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index 72664ad24..9333a576a 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -448,7 +448,7 @@ public final class Diagnostics {
             method.invoke(null, new Object[]{new String[]{}});
         } catch (ClassNotFoundException e) {
             out.println("Not available.");
-            out.println("Download it at http://xml.apache.org/commons/");
+            out.println("Download it at https://xml.apache.org/commons/");
         } catch (InvocationTargetException e) {
             error = e.getTargetException() == null ? e : e.getTargetException();
         } catch (Throwable e) {
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index bf3542a2f..1d3e692cf 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -2243,7 +2243,7 @@ public class Project implements ResourceFactory {
              * Log4jListener which invokes getLogger() which in
              * turn wants to write to the console).
              *
-             * @see http://marc.theaimsgroup.com/?t=110538624200006&r=1&w=2
+             * @see https://marc.info/?l=ant-user&m=111105127200101&w=2
              *
              * We now (Ant 1.6.3 and later) simply swallow the message.
              */
diff --git a/src/main/org/apache/tools/ant/TaskConfigurationChecker.java b/src/main/org/apache/tools/ant/TaskConfigurationChecker.java
index fd9fd8cf1..aa711f8af 100644
--- a/src/main/org/apache/tools/ant/TaskConfigurationChecker.java
+++ b/src/main/org/apache/tools/ant/TaskConfigurationChecker.java
@@ -50,7 +50,7 @@ import java.util.List;
  *     }
  * </pre>
  *
- * @see <a href="http://martinfowler.com/eaaDev/Notification.html">Notification Pattern</a>
+ * @see <a href="https://martinfowler.com/eaaDev/Notification.html">Notification Pattern</a>
  */
 public class TaskConfigurationChecker {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index dc8ca17e3..20c1c1776 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -255,7 +255,7 @@ public class Jar extends Zip {
      * jars on Java 1.4 or earlier Ant will not include META-INF
      * unless explicitly asked to.</p>
      *
-     * @see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4408526">
+     * @see <a href="https://bugs.openjdk.java.net/browse/JDK-4408526">
      * jar -i omits service providers in index.list</a>
      * @since Ant 1.8.0
      * @param flag a <code>boolean</code> value, defaults to false
@@ -573,7 +573,7 @@ public class Jar extends Zip {
     /**
      * Create the index list to speed up classloading.
      * This is a JDK 1.3+ specific feature and is enabled by default. See
-     * <a href="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index">
+     * <a href="https://docs.oracle.com/javase/1.5.0/docs/guide/jar/jar.html#JAR%20Index">
      * the JAR index specification</a> for more details.
      *
      * @param zOut the zip stream representing the jar being built.
@@ -893,7 +893,7 @@ public class Jar extends Zip {
     // CheckStyle:LineLength OFF - Link is too long.
     /**
      * Check against packaging spec
-     * @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"
      */
     // CheckStyle:LineLength ON
     private void checkJarSpec() {
@@ -993,7 +993,7 @@ public class Jar extends Zip {
             // and the check is not case insensitive.
             // see sun.misc.JarIndex
             // see also
-            // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4408526
+            // https://bugs.openjdk.java.net/browse/JDK-4408526
             if (!indexMetaInf && dir.startsWith("META-INF")) {
                 continue;
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
index a41246e30..e46d34a65 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
@@ -93,8 +93,8 @@ public class LoadProperties extends Task {
      * encoding. <p>
      *
      * 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>.</p>
      *
      * @param encoding The new Encoding value
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
index 05eb5284e..a9e4c629b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
@@ -76,8 +76,8 @@ public class LoadResource extends Task {
      * encoding. <p>
      *
      * 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>.</p>
      *
      * @param encoding The new Encoding value
diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 736c6b29a..6417a8da2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -43,7 +43,7 @@ import org.apache.tools.ant.util.StreamUtils;
  * Holds the data of a jar manifest.
  *
  * Manifests are processed according to the
- * <a href="http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html">Jar
+ * <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html">Jar
  * file specification</a>.
  * Specifically, a manifest element consists of
  * a set of attributes and sections. These sections in turn may contain
diff --git a/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java b/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
index 0fe32e98d..fd46e3cbe 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
@@ -137,7 +137,7 @@ class ProcessDestroyer implements Runnable {
             }
             // start the hook thread, a unstarted thread may not be
             // eligible for garbage collection
-            // Cf.: http://developer.java.sun.com/developer/bugParade/bugs/4533087.html
+            // Cf.: https://bugs.openjdk.java.net/browse/JDK-4533087
             destroyProcessThread.setShouldDestroy(false);
             if (!destroyProcessThread.getThreadGroup().isDestroyed()) {
                 // start() would throw IllegalThreadStateException from
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 0210439e2..ece5a9475 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -73,11 +73,11 @@ import org.apache.tools.ant.util.facade.FacadeTaskHelper;
  * <ul>
  *   <li>sun (the standard compiler of the JDK)</li>
  *   <li>kaffe (the standard compiler of
- *       <a href="http://www.kaffe.org">Kaffe</a>)</li>
+ *       <a href="https://github.com/kaffe/kaffe">Kaffe</a>)</li>
  *   <li>weblogic</li>
  * </ul>
  *
- * <p>The <a href="http://dione.zcu.cz/~toman40/miniRMI/">miniRMI</a>
+ * <p>The miniRMI
  * project contains a compiler implementation for this task as well,
  * please consult miniRMI's documentation to learn how to use it.</p>
  *
diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
index a6d97f1ea..1a23ba3bf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
@@ -42,7 +42,7 @@ import org.apache.tools.ant.util.ResourceUtils;
  *
  * Timestamp driven signing is based on the unstable and inadequately documented
  * information in the Java1.5 docs
- * @see <a href="http://java.sun.com/j2se/1.5.0/docs/guide/security/time-of-signing-beta1.html">
+ * @see <a href="https://docs.oracle.com/javase/1.5.0/docs/guide/security/time-of-signing-beta1.html">
  * beta documentation</a>
  * @ant.task category="java"
  * @since Ant 1.1
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java
index cdf4a0030..1c56a661a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java
@@ -243,7 +243,7 @@ public class Tar extends MatchingTask {
      * default encoding.
      *
      * <p>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>.</p>
+     * 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>.</p>
      * @param encoding the encoding name
      *
      * @since Ant 1.9.5
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 4f8769a0e..145b04eca 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -1170,7 +1170,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
 
     /**
      * Specify how the result tree should be output as specified
-     * in the <a href="http://www.w3.org/TR/xslt#output">
+     * in the <a href="https://www.w3.org/TR/xslt#output">
      * specification</a>.
      * @since Ant 1.5
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index c70f6a9b6..b545cb83e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -408,7 +408,7 @@ public class Zip extends MatchingTask {
      * default encoding.
      *
      * <p>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>.</p>
+     * 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>.</p>
      * @param encoding the encoding name
      */
     public void setEncoding(final String encoding) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
index 2fb00f114..29962f9da 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
@@ -372,14 +372,8 @@ public class ChangeLogTask extends AbstractCvsTask {
             //bug#30471
             //this is caused by Date.after throwing a NullPointerException
             //for some reason there's no date set in the CVSEntry
-            //Java 1.3.1 API
-            //http://java.sun.com/j2se/1.3/docs/api/java/util/Date.html#after(java.util.Date)
-            //doesn't throw NullPointerException
-            //Java 1.4.2 + 1.5 API
-            //http://java.sun.com/j2se/1.4.2/docs/api/java/util/Date.html#after(java.util.Date)
-            //according to the docs it doesn't throw, according to the bug report it does
-            //http://java.sun.com/j2se/1.5.0/docs/api/java/util/Date.html#after(java.util.Date)
-            //according to the docs it does throw
+            //https://docs.oracle.com/javase/1.5.0/docs/api/java/util/Date.html#after(java.util.Date)
+            //according to the docs as of 1.5 it does throw
 
             //for now skip entries which are missing a date
             if (null == date) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
index 4833947cd..354dcabb8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
@@ -130,7 +130,7 @@ public class SchemaValidate extends XMLValidateTask {
 
     /**
      * Set schema attributes in a JAXP 1.2 engine.
-     * @see <A href="http://java.sun.com/xml/jaxp/change-requests-11.html">
+     * @see <A href="https://java.sun.com/xml/jaxp/change-requests-11.html">
      * JAXP 1.2 Approved CHANGES</A>
      * @return true on success, false on failure
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index 92586d508..2edabda27 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -703,7 +703,7 @@ public class XMLValidateTask extends Task {
 
     /**
      * A Parser property.
-     * See <a href="http://xml.apache.org/xerces-j/properties.html">
+     * See <a href="https://xml.apache.org/xerces-j/properties.html">
      * XML parser properties</a> for usable properties
      * @since ant 1.6.2
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
index 4a96ef705..d781769b9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
@@ -31,7 +31,7 @@ import java.util.stream.IntStream;
  * constants used in a Java class file. It stores strings, constant values,
  * class names, method names, field names etc.
  *
- * @see <a href="http://java.sun.com/docs/books/vmspec/">The Java Virtual
+ * @see <a href="https://docs.oracle.com/javase/specs/index.html">The Java Virtual
  *      Machine Specification</a>
  */
 public class ConstantPool {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
index 4bf51818e..48b250469 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
@@ -53,7 +53,7 @@ public final class Extension {
      * are not required for the library to operate but if present will be used.
      * It is NOT part of the official "Optional Package" specification.
      *
-     * @see <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/spec.html#dependency">
+     * @see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/spec.html#dependency">
      *      Installed extension dependency</a>
      */
     public static final Attributes.Name OPTIONAL_EXTENSION_LIST
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java
index 419cd7f50..c90f98094 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java
@@ -34,8 +34,8 @@ import org.apache.tools.ant.types.FileSet;
  * The specification for this mechanism is available in the JDK1.3
  * documentation in the directory
  * $JDK_HOME/docs/guide/extensions/versioning.html. Alternatively it is
- * available online at <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html">
- * http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>
+ * available online at <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html">
+ * https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html</a>.</p>
  *
  * @ant.task name="jarlib-display"
  */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
index 86682def3..ac4d914ac 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
@@ -44,8 +44,8 @@ import org.apache.tools.ant.Task;
  * The specification for this mechanism is available in the JDK1.3
  * documentation in the directory
  * $JDK_HOME/docs/guide/extensions/versioning.html. Alternatively it is
- * available online at <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html">
- * http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>
+ * available online at <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html">
+ * https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html</a>.</p>
  *
  * @ant.task name="jarlib-manifest"
  */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
index 1aa47c371..24494f610 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
@@ -44,10 +44,10 @@ public class LibFileSet extends FileSet {
      * String that is the base URL for the libraries
      * when constructing the "Implementation-URL"
      * attribute. For instance setting the base to
-     * "http://jakarta.apache.org/avalon/libs/" and then
+     * "https://jakarta.apache.org/avalon/libs/" and then
      * including the library "excalibur-cli-1.0.jar" in the
      * fileset will result in the "Implementation-URL" attribute
-     * being set to "http://jakarta.apache.org/avalon/libs/excalibur-cli-1.0.jar"
+     * being set to "https://jakarta.apache.org/avalon/libs/excalibur-cli-1.0.jar"
      *
      * Note this is only used if the library does not define
      * "Implementation-URL" itself.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
index 1471155aa..1ba68a4cb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
@@ -45,13 +45,11 @@ import com.sun.media.jai.codec.FileSeekableStream;
 
 /**
  * A MatchingTask which relies on <a
- * href="http://java.sun.com/products/java-media/jai">JAI (Java
+ * href="https://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-client-419417.html">JAI (Java
  * Advanced Imaging)</a> to perform image manipulation operations on
  * existing images.  The operations are represented as ImageOperation
  * DataType objects.  The operations are arranged to conform to the
- * Chaining Model of JAI.  Check out the <a
- * href="http://java.sun.com/products/java-media/jai/forDevelopers/jai1_0_1guide-unc/">
- * JAI Programming Guide</a>.
+ * Chaining Model of JAI.  Check out the JAI Programming Guide.
  *
  * @deprecated JAI is not developed any more. Internal APIs that JAI depends on were
  * scheduled for removal in Java 7 and finally removed in Java 9.
@@ -108,8 +106,7 @@ public class Image extends MatchingTask {
 
     /**
      * Set the image encoding type.  <a
-     * href="http://java.sun.com/products/java-media/jai/forDevelopers/jai1_0_1guide-unc/Encode.doc.html#56610">
-     * See this table in the JAI Programming Guide</a>.
+     * See the encoding table in the JAI Programming Guide</a>.
      * @param encoding the String image encoding.
      */
     public void setEncoding(String encoding) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index 3df2c3ea0..19479d551 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -53,7 +53,7 @@ import jdepend.textui.JDepend;
  *
  * <p>JDepend is a tool to generate design quality metrics for each Java package.
  * It has been initially created by Mike Clark. JDepend can be found at <a
- * href="http://www.clarkware.com/software/JDepend.html">http://www.clarkware.com/software/JDepend.html</a>.
+ * href="https://github.com/clarkware/jdepend">https://github.com/clarkware/jdepend</a>.
  *
  * The current implementation spawn a new Java VM.
  *
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 82e1d1bf2..a0ce572ba 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -72,7 +72,7 @@ import org.apache.tools.ant.util.StringUtils;
  *
  * <p>JUnit is a framework to create unit tests. It has been initially
  * created by Erich Gamma and Kent Beck.  JUnit can be found at <a
- * href="http://www.junit.org">http://www.junit.org</a>.
+ * href="https://www.junit.org">https://www.junit.org</a>.
  *
  * <p><code>JUnitTask</code> can run a single specific
  * <code>JUnitTest</code> using the <code>test</code> element.</p>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
index 26f47b9ec..12fae86fb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
@@ -182,7 +182,7 @@ public class RExecTask extends Task {
     /**
      *  This class handles the abstraction of the rexec protocol.
      *  Currently it is a wrapper around <a
-     *  href="http://jakarta.apache.org/commons/net/index.html">Jakarta
+     *  href="https://jakarta.apache.org/commons/net/index.html">Jakarta
      *  Commons Net</a>.
      */
     public class AntRExecClient extends RExecClient {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
index 897179fe0..4dd70e529 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
@@ -51,8 +51,8 @@ import org.apache.tools.ant.util.ProxySetup;
  * and <code>proxyPassword</code> attributes. These can also be
  * used against SOCKS5 servers.
  * </p>
- * @see <a href="http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html">
- *  java 1.5 network property list</a>
+ * @see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html">
+ *  https://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html</a>
   *@since       Ant 1.5
  * @ant.task category="network"
  */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
index b3eb0046a..cbc9f3709 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
@@ -324,7 +324,7 @@ public class TelnetTask extends Task {
     /**
      *  This class handles the abstraction of the telnet protocol.
      *  Currently it is a wrapper around <a
-     *  href="http://jakarta.apache.org/commons/net/index.html">Jakarta
+     *  href="https://jakarta.apache.org/commons/net/index.html">Jakarta
      *  Commons Net</a>.
      */
     public class AntTelnetClient extends TelnetClient {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 7446352a3..c31ae3570 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
@@ -45,7 +45,7 @@ import org.apache.tools.ant.util.FileUtils;
  *
  * Extracts the latest edition of the source code from a PVCS repository.
  * PVCS is a version control system
- * developed by <a href="http://www.merant.com/products/pvcs">Merant</a>.
+ * developed by Merant.
  * <p>
  * Before using this tag, the user running ant must have access to the commands
  * of PVCS (get and pcli) and must have access to the repository. Note that the way to specify
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index c63fce348..a61ad16d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -587,7 +587,7 @@ public class Symlink extends DispatchTask {
         // Not clearing/updating that cache results in this deleted (and later recreated) symlink
         // to point to a wrong/outdated target for a few seconds (30 seconds is the time the JRE
         // maintains the cache entries for). All this is implementation detail of the JRE and
-        // is a JRE bug http://mail.openjdk.java.net/pipermail/core-libs-dev/2017-December/050540.html,
+        // is a JRE bug https://mail.openjdk.java.net/pipermail/core-libs-dev/2017-December/050540.html,
         // but given that it affects our tests (SymlinkTest#testRecreate consistently fails
         // on MacOS/Unix) as well as the Symlink task, it makes sense to use this API instead of
         // the Files#delete(Path) API
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
index af4a70d11..7f5a6c844 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
@@ -23,8 +23,8 @@ import org.apache.tools.ant.types.Commandline;
  * Run rmic in a new process with -Xnew set.
  * This switches rmic to use a new compiler, one that doesn't work in-process
  * on ant on java1.6.
- * see: <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38732">
- * http://issues.apache.org/bugzilla/show_bug.cgi?id=38732</a>
+ * see: <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=38732">
+ * https://issues.apache.org/bugzilla/show_bug.cgi?id=38732</a>
  */
 public class XNewRmic extends ForkingSunRmic {
 
diff --git a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
index d7fc888b3..66bf98e84 100644
--- a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
+++ b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
@@ -63,8 +63,8 @@ public abstract class EnumeratedAttribute {
      * @return                  Configured EA
      * @throws BuildException   If the class could not be found or the value
      *                          is not valid for the given EA-class.
-     * @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14831">
-     * http://issues.apache.org/bugzilla/show_bug.cgi?id=14831</a>
+     * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=14831">
+     * https://issues.apache.org/bugzilla/show_bug.cgi?id=14831</a>
      */
     public static EnumeratedAttribute getInstance(
         Class<? extends EnumeratedAttribute> clazz,
diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index 98430e053..d5bce3323 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -55,7 +55,7 @@ import org.xml.sax.XMLReader;
  * both for Entity resolution and URI resolution, in accordance with
  * the {@link org.xml.sax.EntityResolver EntityResolver} and {@link
  * javax.xml.transform.URIResolver URIResolver} interfaces as defined
- * in the <a href="http://java.sun.com/xml/jaxp">Java API for XML
+ * in the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/xml/jaxp/index.html">Java API for XML
  * Processing Specification</a>.</p>
  *
  * <p>Resource locations can be specified either in-line or in
@@ -597,8 +597,8 @@ public class XMLCatalog extends DataType
     /**
      * Utility method to remove trailing fragment from a URI.
      * For example,
-     * <code>http://java.sun.com/index.html#chapter1</code>
-     * would return <code>http://java.sun.com/index.html</code>.
+     * <code>https://java.sun.com/index.html#chapter1</code>
+     * would return <code>https://java.sun.com/index.html</code>.
      *
      * @param uri The URI to process.  It may or may not contain a
      *            fragment.
diff --git a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
index 11959e60d..5ce22f4bd 100644
--- a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
@@ -29,7 +29,7 @@ import org.apache.tools.ant.util.FileNameMapper;
  * <p>This mapper was inspired by a user-list thread that mentioned
  * wget's --cut-dirs option.</p>
  *
- * @see <a href="http://mail-archives.apache.org/mod_mbox/ant-user/201009.mbox/%3C51772743BEA5D44A9EA5BF52AADDD6FB010E96F6@hammai008.delphi.local%3E">
+ * @see <a href="https://mail-archives.apache.org/mod_mbox/ant-user/201009.mbox/%3C51772743BEA5D44A9EA5BF52AADDD6FB010E96F6@hammai008.delphi.local%3E">
  * simplify copy with regexpmapper</a>
  */
 public class CutDirsMapper implements FileNameMapper {
diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceList.java b/src/main/org/apache/tools/ant/types/resources/ResourceList.java
index 1648afe73..2925cb418 100644
--- a/src/main/org/apache/tools/ant/types/resources/ResourceList.java
+++ b/src/main/org/apache/tools/ant/types/resources/ResourceList.java
@@ -88,8 +88,8 @@ public class ResourceList extends DataType implements ResourceCollection {
      *
      * <p>
      * 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>.
+     * <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>.
      * </p>
      *
      * @param encoding String
diff --git a/src/main/org/apache/tools/ant/types/spi/Provider.java b/src/main/org/apache/tools/ant/types/spi/Provider.java
index aac174ffc..9ec652cb8 100644
--- a/src/main/org/apache/tools/ant/types/spi/Provider.java
+++ b/src/main/org/apache/tools/ant/types/spi/Provider.java
@@ -25,8 +25,8 @@ import org.apache.tools.ant.ProjectComponent;
  * This class corresponds to the nested element
  * &lt;provider type="type"&gt; in the &lt;service type=""&gt;
  * nested element of the jar task.
- * @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31520">
- * http://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
+ * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=31520">
+ * https://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
  */
 public class Provider extends ProjectComponent {
     private String type;
diff --git a/src/main/org/apache/tools/ant/types/spi/Service.java b/src/main/org/apache/tools/ant/types/spi/Service.java
index ddb287499..b68cd8b7f 100644
--- a/src/main/org/apache/tools/ant/types/spi/Service.java
+++ b/src/main/org/apache/tools/ant/types/spi/Service.java
@@ -31,8 +31,8 @@ import org.apache.tools.ant.ProjectComponent;
 /**
  * ANT Jar-Task SPI extension
  *
- * @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31520">
- * http://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
+ * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=31520">
+ * https://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
  */
 public class Service extends ProjectComponent {
     private List<Provider> providerList = new ArrayList<>();
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index 20b914782..4aafeb625 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -476,10 +476,10 @@ public class DOMElementWriter {
      * <code>&amp;#x5d;&amp;#x5d;&amp;gt;</code>.</p>
      *
      * <p>See XML 1.0 2.2 <a
-     * href="http://www.w3.org/TR/1998/REC-xml-19980210#charsets">
-     * http://www.w3.org/TR/1998/REC-xml-19980210#charsets</a> and
+     * href="https://www.w3.org/TR/1998/REC-xml-19980210#charsets">
+     * https://www.w3.org/TR/1998/REC-xml-19980210#charsets</a> and
      * 2.7 <a
-     * href="http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect">http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect</a>.</p>
+     * href="https://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect">https://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect</a>.</p>
      * @param value the value to be encoded.
      * @return the encoded value.
      */
@@ -502,10 +502,10 @@ public class DOMElementWriter {
      * <code>&amp;#x5d;&amp;#x5d;&amp;gt;</code>.</p>
      *
      * <p>See XML 1.0 2.2 <a
-     * href="http://www.w3.org/TR/1998/REC-xml-19980210#charsets">
-     * http://www.w3.org/TR/1998/REC-xml-19980210#charsets</a> and
+     * href="https://www.w3.org/TR/1998/REC-xml-19980210#charsets">
+     * https://www.w3.org/TR/1998/REC-xml-19980210#charsets</a> and
      * 2.7 <a
-     * href="http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect">http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect</a>.</p>
+     * href="https://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect">https://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect</a>.</p>
      * @param value the value to be encoded.
      * @param out where to write the encoded data to.
      * @throws IOException if data cannot be written
@@ -581,8 +581,8 @@ public class DOMElementWriter {
      * Is the given character allowed inside an XML document?
      *
      * <p>See XML 1.0 2.2 <a
-     * href="http://www.w3.org/TR/1998/REC-xml-19980210#charsets">
-     * http://www.w3.org/TR/1998/REC-xml-19980210#charsets</a>.</p>
+     * href="https://www.w3.org/TR/1998/REC-xml-19980210#charsets">
+     * https://www.w3.org/TR/1998/REC-xml-19980210#charsets</a>.</p>
      * @param c the character to test.
      * @return true if the character is allowed.
      * @since 1.10, Ant 1.5
diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java
index 5fa2d22ca..bf92bf570 100644
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
 
 /**
  * Helper methods to deal with date/time formatting with a specific
- * defined format (<a href="http://www.w3.org/TR/NOTE-datetime">ISO8601</a>)
+ * defined format (<a href="https://www.w3.org/TR/NOTE-datetime">ISO8601</a>)
  * or a correct pluralization of elapsed time in minutes and seconds.
  *
  * @since Ant 1.5
@@ -177,7 +177,7 @@ public final class DateUtils {
      * Calculate the phase of the moon for a given date.
      *
      * <p>Code heavily influenced by hacklib.c in <a
-     * href="http://www.nethack.org/">Nethack</a></p>
+     * href="https://www.nethack.org/">Nethack</a></p>
      *
      * <p>The Algorithm:
      *
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index 72f1e2045..ad90bcb93 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -1259,7 +1259,7 @@ public class FileUtils {
      *
      * <p>The coding of the output is the same as what File.toURI().toASCIIString() produces</p>
      *
-     * See <a href="http://www.w3.org/TR/xml11/#dt-sysid">dt-sysid</a>
+     * See <a href="https://www.w3.org/TR/xml11/#dt-sysid">dt-sysid</a>
      * which makes some mention of how
      * characters not supported by URI Reference syntax should be escaped.
      *
diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index 7d6ad67c6..bd5e65318 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -302,7 +302,7 @@ public final class JavaEnvUtils {
      * Checks whether the current Java VM is Kaffe.
      * @return true if the current Java VM is Kaffe.
      * @since Ant 1.6.3
-     * @see <a href="http://www.kaffe.org/">http://www.kaffe.org/</a>
+     * @see <a href="https://github.com/kaffe/kaffe">https://github.com/kaffe/kaffe</a>
      */
     public static boolean isKaffe() {
         return kaffeDetected;
diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
index bd3437df1..fbdb6b930 100644
--- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
+++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
@@ -39,7 +39,7 @@ import java.util.Properties;
 /**
  * <p>A Properties collection which preserves comments and whitespace
  * present in the input stream from which it was loaded.</p>
- * <p>The class defers the usual work of the <a href="http://java.sun.com/j2se/1.3/docs/api/java/util/Properties.html">java.util.Properties</a>
+ * <p>The class defers the usual work of the <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html">java.util.Properties</a>
  * class to there, but it also keeps track of the contents of the
  * input stream from which it was loaded (if applicable), so that it can
  * write out the properties in as close a form as possible to the input.</p>
@@ -436,7 +436,7 @@ public class LayoutPreservingProperties extends Properties {
     /**
      * Unescape the string according to the rules for a Properties
      * file, as laid out in the docs for <a
-     * href="http://java.sun.com/j2se/1.3/docs/api/java/util/Properties.html">java.util.Properties</a>.
+     * href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html">java.util.Properties</a>.
      * @param s the string to unescape (coming from the source file)
      * @return the unescaped string
      */
@@ -503,7 +503,7 @@ public class LayoutPreservingProperties extends Properties {
     /**
      * Escape the string <code>s</code> according to the rules in the
      * docs for <a
-     * href="http://java.sun.com/j2se/1.3/docs/api/java/util/Properties.html">java.util.Properties</a>.
+     * href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html">java.util.Properties</a>.
      * @param s the string to escape
      * @return the escaped string
      */
@@ -514,7 +514,7 @@ public class LayoutPreservingProperties extends Properties {
     /**
      * Escape the string <code>s</code> according to the rules in the
      * docs for <a
-     * href="http://java.sun.com/j2se/1.3/docs/api/java/util/Properties.html">java.util.Properties</a>.
+     * href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html">java.util.Properties</a>.
      * This method escapes all the whitespace, not just the stuff at
      * the beginning.
      * @param s the string to escape
@@ -527,7 +527,7 @@ public class LayoutPreservingProperties extends Properties {
     /**
      * Escape the string <code>s</code> according to the rules in the
      * docs for <a
-     * href="http://java.sun.com/j2se/1.3/docs/api/java/util/Properties.html">java.util.Properties</a>.
+     * href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html">java.util.Properties</a>.
      * @param s the string to escape
      * @param escapeAllSpaces if <code>true</code> the method escapes
      * all the spaces, if <code>false</code>, it escapes only the
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index 4cdffba80..ea3da96ac 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -129,7 +129,7 @@ public final class StringUtils {
         // implementation is ok though does allocation/copying
         // StringBuffer.toString().endsWith() does massive memory
         // allocation/copying on JDK 1.5
-        // See http://issues.apache.org/bugzilla/show_bug.cgi?id=37169
+        // See https://issues.apache.org/bugzilla/show_bug.cgi?id=37169
         int endIndex = suffix.length() - 1;
         int bufferIndex = buffer.length() - 1;
         while (endIndex >= 0) {
diff --git a/src/main/org/apache/tools/ant/util/XmlConstants.java b/src/main/org/apache/tools/ant/util/XmlConstants.java
index f9b502825..aa0d5b3ef 100644
--- a/src/main/org/apache/tools/ant/util/XmlConstants.java
+++ b/src/main/org/apache/tools/ant/util/XmlConstants.java
@@ -19,8 +19,8 @@ package org.apache.tools.ant.util;
 
 /**
  * XML Parser constants, all kept in one place for ease of reuse
- * @see <a href="http://xml.apache.org/xerces-j/features.html">Xerces features</a>
- * @see <a href="http://xml.apache.org/xerces-j/properties.html">Xerces properties</a>
+ * @see <a href="https://xml.apache.org/xerces-j/features.html">Xerces features</a>
+ * @see <a href="https://xml.apache.org/xerces-j/properties.html">Xerces properties</a>
  * @see <a href=
  * "http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"
  * >SAX.</a>
diff --git a/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java b/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
index 404a2252a..8ff0f21fb 100644
--- a/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
+++ b/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
@@ -41,7 +41,7 @@ public class ProxyDiagnostics {
     private URI destURI;
 
     /** {@value} */
-    public static final String DEFAULT_DESTINATION = "http://ant.apache.org/";
+    public static final String DEFAULT_DESTINATION = "https://ant.apache.org/";
 
     /**
      * create a diagnostics binding for a specific URI
@@ -98,4 +98,4 @@ public class ProxyDiagnostics {
         }
         return result.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java
index fc6ca3526..01439e1c5 100644
--- a/src/main/org/apache/tools/bzip2/BlockSort.java
+++ b/src/main/org/apache/tools/bzip2/BlockSort.java
@@ -63,14 +63,14 @@ import java.util.BitSet;
  * <p>For more information see for example:</p>
  * <ul>
  *   <li><a
- *   href="http://www.hpl.hp.com/techreports/Compaq-DEC/SRC-RR-124.pdf">Burrows,
+ *   href="https://www.hpl.hp.com/techreports/Compaq-DEC/SRC-RR-124.pdf">Burrows,
  *   M. and Wheeler, D.: A Block-sorting Lossless Data Compression
  *   Algorithm</a></li>
  *   <li><a href="http://webglimpse.net/pubs/suffix.pdf">Manber, U. and
  *   Myers, G.: Suffix arrays: A new method for on-line string
  *   searches</a></li>
  *   <li><a
- *   href="http://www.cs.tufts.edu/~nr/comp150fp/archive/bob-sedgewick/fast-strings.pdf">Bentley,
+ *   href="https://www.cs.tufts.edu/~nr/comp150fp/archive/bob-sedgewick/fast-strings.pdf">Bentley,
  *   J.L. and Sedgewick, R.: Fast Algorithms for Sorting and Searching
  *   Strings</a></li>
  * </ul>
diff --git a/src/main/org/apache/tools/mail/ErrorInQuitException.java b/src/main/org/apache/tools/mail/ErrorInQuitException.java
index ba656f300..806932212 100644
--- a/src/main/org/apache/tools/mail/ErrorInQuitException.java
+++ b/src/main/org/apache/tools/mail/ErrorInQuitException.java
@@ -25,7 +25,7 @@ import java.io.IOException;
  *
  * <p>This seems to happen with some version of MS Exchange that
  * doesn't respond with a 221 code immediately.  See <a
- * href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5273">Bug
+ * href="https://bz.apache.org/bugzilla/show_bug.cgi?id=5273">Bug
  * report 5273</a>.</p>
  *
  */
diff --git a/src/main/org/apache/tools/tar/TarBuffer.java b/src/main/org/apache/tools/tar/TarBuffer.java
index 22fe59d3c..fcea51104 100644
--- a/src/main/org/apache/tools/tar/TarBuffer.java
+++ b/src/main/org/apache/tools/tar/TarBuffer.java
@@ -270,12 +270,12 @@ public class TarBuffer {
                 if (offset == 0) {
                     // Ensure that we do not read gigabytes of zeros
                     // for a corrupt tar file.
-                    // See http://issues.apache.org/bugzilla/show_bug.cgi?id=39924
+                    // See https://issues.apache.org/bugzilla/show_bug.cgi?id=39924
                     return false;
                 }
                 // However, just leaving the unread portion of the buffer dirty does
                 // cause problems in some cases.  This problem is described in
-                // http://issues.apache.org/bugzilla/show_bug.cgi?id=29877
+                // https://issues.apache.org/bugzilla/show_bug.cgi?id=29877
                 //
                 // The solution is to fill the unused portion of the buffer with zeros.
 
diff --git a/src/main/org/apache/tools/tar/TarConstants.java b/src/main/org/apache/tools/tar/TarConstants.java
index 9759e68c7..56362f732 100644
--- a/src/main/org/apache/tools/tar/TarConstants.java
+++ b/src/main/org/apache/tools/tar/TarConstants.java
@@ -252,7 +252,7 @@ public interface TarConstants {
      */
     byte LF_GNUTYPE_SPARSE = (byte) 'S';
 
-    // See "http://www.opengroup.org/onlinepubs/009695399/utilities/pax.html#tag_04_100_13_02"
+    // See "https://www.opengroup.org/onlinepubs/009695399/utilities/pax.html#tag_04_100_13_02"
 
     /**
      * Identifies the entry as a Pax extended header.
diff --git a/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java b/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
index 1d78da287..70a34d201 100644
--- a/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
+++ b/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
@@ -24,7 +24,7 @@ package org.apache.tools.zip;
  * <p>Stores the UTF-8 version of the file comment as stored in the
  * central directory header.</p>
  *
- * <p>See <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">PKWARE's
+ * <p>See <a href="https://www.pkware.com/documents/casestudies/APPNOTE.TXT">PKWARE's
  * APPNOTE.TXT, section 4.6.8</a>.</p>
  *
  */
diff --git a/src/main/org/apache/tools/zip/UnicodePathExtraField.java b/src/main/org/apache/tools/zip/UnicodePathExtraField.java
index 64b2300c5..16496a8e9 100644
--- a/src/main/org/apache/tools/zip/UnicodePathExtraField.java
+++ b/src/main/org/apache/tools/zip/UnicodePathExtraField.java
@@ -24,7 +24,7 @@ package org.apache.tools.zip;
  * <p>Stores the UTF-8 version of the file name field as stored in the
  * local header and central directory header.</p>
  *
- * <p>See <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">PKWARE's
+ * <p>See <a href="https://www.pkware.com/documents/casestudies/APPNOTE.TXT">PKWARE's
  * APPNOTE.TXT, section 4.6.9</a>.</p>
  */
 public class UnicodePathExtraField extends AbstractUnicodeExtraField {
diff --git a/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java b/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
index 4ce1bff50..306382705 100644
--- a/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
+++ b/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
@@ -22,7 +22,7 @@ package org.apache.tools.zip;
  * Wrapper for extra field data that doesn't conform to the recommended format of header-tag + size + data.
  *
  * <p>The header-id is artificial (and not listed as a known ID in
- * <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">APPNOTE.TXT</a>).
+ * <a href="https://www.pkware.com/documents/casestudies/APPNOTE.TXT">APPNOTE.TXT</a>).
  * Since it isn't used anywhere except to satisfy the
  * ZipExtraField contract it shouldn't matter anyway.</p>
  *
diff --git a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
index 8f9331c32..dd58b6289 100644
--- a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
+++ b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
@@ -27,7 +27,7 @@ import java.util.zip.ZipException;
  * Holds size and other extended information for entries that use Zip64
  * features.
  *
- * <p>See <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">PKWARE's
+ * <p>See <a href="https://www.pkware.com/documents/casestudies/APPNOTE.TXT">PKWARE's
  * APPNOTE.TXT, section 4.5.3</a>.</p>
  *
  * <p>Currently Ant doesn't support encrypting the
diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java
index 246c209ef..00f0db33f 100644
--- a/src/main/org/apache/tools/zip/ZipEntry.java
+++ b/src/main/org/apache/tools/zip/ZipEntry.java
@@ -31,7 +31,7 @@ import java.util.zip.ZipException;
  * access to the internal and external file attributes.
  *
  * <p>The extra data is expected to follow the recommendation of
- * <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">APPNOTE.txt</a>:</p>
+ * <a href="https://www.pkware.com/documents/casestudies/APPNOTE.TXT">APPNOTE.txt</a>:</p>
  * <ul>
  *   <li>the extra byte array consists of a sequence of extra fields</li>
  *   <li>each extra fields starts by a two byte header id followed by
diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java
index e0ccbb328..10c581bbe 100644
--- a/src/main/org/apache/tools/zip/ZipFile.java
+++ b/src/main/org/apache/tools/zip/ZipFile.java
@@ -103,7 +103,7 @@ public class ZipFile implements Closeable {
      * The encoding to use for filenames and the file comment.
      *
      * <p>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/1.5.0/docs/guide/intl/encoding.doc.html">https://docs.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html</a>.
      * Defaults to the platform's default character encoding.</p>
      */
     private final String encoding;
diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java
index 0300eddc3..70ad9c353 100644
--- a/src/main/org/apache/tools/zip/ZipOutputStream.java
+++ b/src/main/org/apache/tools/zip/ZipOutputStream.java
@@ -253,7 +253,7 @@ public class ZipOutputStream extends FilterOutputStream {
      * The encoding to use for filenames and the file comment.
      *
      * <p>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/1.5.0/docs/guide/intl/encoding.doc.html">https://docs.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html</a>.
      * Defaults to the platform's default character encoding.</p>
      *
      * @since 1.3
@@ -379,7 +379,7 @@ public class ZipOutputStream extends FilterOutputStream {
      * The encoding to use for filenames and the file comment.
      *
      * <p>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/1.5.0/docs/guide/intl/encoding.doc.html">https://docs.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html</a>.
      * Defaults to the platform's default character encoding.</p>
      * @param encoding the encoding value
      * @since 1.3
diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
index 57205d251..660a28c94 100644
--- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
+++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
@@ -71,7 +71,7 @@ public class AntClassLoaderDelegationTest {
         // The intended result URLs:
         URL urlFromPath = new URL(
             FILE_UTILS.toURI(buildTestcases) + "org/" + TEST_RESOURCE);
-        URL urlFromParent = new URL("http://ant.apache.org/" + TEST_RESOURCE);
+        URL urlFromParent = new URL("https://ant.apache.org/" + TEST_RESOURCE);
         assertEquals("correct resources (regular delegation order)",
             Arrays.asList(urlFromParent, urlFromPath),
                 Collections.list(acl.getResources(TEST_RESOURCE)));
@@ -111,7 +111,7 @@ public class AntClassLoaderDelegationTest {
             if (name.equals(TEST_RESOURCE)) {
                 return Collections.enumeration(
                     Collections.singleton(
-                        new URL("http://ant.apache.org/" + name)));
+                        new URL("https://ant.apache.org/" + name)));
             } else {
                 return Collections.enumeration(Collections.emptySet());
             }
diff --git a/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java b/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
index 7e5d08caf..54fc4a9ab 100644
--- a/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
@@ -147,8 +147,8 @@ public class LocatorTest {
     }
 
     @Test
-    public void testHttpURI() {
-        String url = "http://ant.apache.org";
+    public void testHttpsURI() {
+        String url = "https://ant.apache.org";
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage(Locator.ERROR_NOT_FILE_URI + url);
         Locator.fromURI(url);
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
index d54a4575a..c4a76eb2e 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
@@ -59,7 +59,7 @@ public class AntlibTest {
     /**
      * Confirms that all matching resources will be used, so that you
      * can collect several antlibs in one Definer call.
-     * @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24024">bug 24024</a>
+     * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=24024">bug 24024</a>
      */
     @Test
     public void testAntlibResource() {