From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Fri, 23 Jul 2021 04:31:13 +0000 (+0700)
Subject: Globally replace HTTP links to eclipse.org by HTTPS
X-Git-Tag: V1_9_21_1~83
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8518fcf96e52edea67b862ade95b64f63607e605;p=aspectj.git

Globally replace HTTP links to eclipse.org by HTTPS

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---

diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java
index 68bf340cf..243993533 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java
@@ -51,7 +51,7 @@ public class ErrorDialog extends JDialog {
             String exceptionName = "<unknown exception>";
             if (throwable != null) exceptionName = throwable.getClass().getName();
             this.error_label1.setText("Exception: " + exceptionName);
-            this.error_label2.setText("If you can't fix it, please submit a bug to http://dev.eclipse.org/bugs");
+            this.error_label2.setText("If you can't fix it, please submit a bug to https://dev.eclipse.org/bugs");
             this.stackTrace_textArea.setText("Message: " + message + '\n' + "Stack trace: " + details);
             this.setSize(420, 330);
             this.setLocationRelativeTo(owner);
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java
index 6a21852aa..9fc1212e9 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java
@@ -59,12 +59,12 @@ public class OptionsFrame extends JFrame {
         "conforming to the Open Source Definition.\n\n" +
         "For support or for more information about the AspectJ\n" +
         "project or the license, visit the project home page at\n" +
-        "    http://eclipse.org/aspectj\n\n" +
+        "    https://eclipse.org/aspectj\n\n" +
         "If you find a bug (not solved by the documentation in the\n" +
         "Development Environment Guide available with this release,\n" +
         "any release notes, or the bug database), please submit steps\n" +
         "to reproduce the bug (using the IDE component) at:\n" +
-        "    http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ";
+        "    https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ";
 
     private JTabbedPane main_tabbedPane = new JTabbedPane();
     private JPanel button_panel = new JPanel();
diff --git a/build/products/aspectj/install/intro.html b/build/products/aspectj/install/intro.html
index d5b543705..c8992bac2 100644
--- a/build/products/aspectj/install/intro.html
+++ b/build/products/aspectj/install/intro.html
@@ -6,12 +6,12 @@
 <p align="center">Version ${build.version.long} built on ${build.date}</p>
 <p>This installs the complete AspectJ 9 Development Kit (AJDK) distribution, with
 the compiler, aspect libraries, structure browser, ant tasks,
-documentation, and examples.  
+documentation, and examples.
 This distribution is covered by the Eclipse Public License v 2.0 (see
 https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt).
 <p>
 For IDE integrations or source code, see the project home page at
-http://eclipse.org/aspectj</p>
+https://eclipse.org/aspectj</p>
 
 
 <p>${copyright.allRights.from1998}</p>
diff --git a/build/products/tools/install/intro.html b/build/products/tools/install/intro.html
index 3194fac4c..2bf78d302 100644
--- a/build/products/tools/install/intro.html
+++ b/build/products/tools/install/intro.html
@@ -16,8 +16,8 @@
 <p>
 This is a binary only release of tools made available under
 the Eclipse Public License.
-For more information on the license or to download the source code, 
-see http://eclipse.org/aspectj</p>
+For more information on the license or to download the source code,
+see https://eclipse.org/aspectj</p>
 <p>${copyright.allRights.from1998}</p>
 <p></p>
 
diff --git a/build/readme-build-and-test-aspectj.html b/build/readme-build-and-test-aspectj.html
index 6ae35203f..4019a3f9d 100644
--- a/build/readme-build-and-test-aspectj.html
+++ b/build/readme-build-and-test-aspectj.html
@@ -1,20 +1,20 @@
 <html>
 <head>
-<title>Build and Test AspectJ</title>	
+<title>Build and Test AspectJ</title>
 </head>
 <body>
 <h1>Build and Test AspectJ</h1>
 
 This describes how to build and test AspectJ
 for developers working on source code for AspectJ.
-It covers building with Ant or Eclipse and testing with 
+It covers building with Ant or Eclipse and testing with
 JUnit and the harness used for compiler tests.
 
-For information on how the build works and how to 
-debug failed builds, see 
+For information on how the build works and how to
+debug failed builds, see
 <a href="readme-build-module.html">
          readme-build-module.html</a>.
-             
+
 <ol>
   <li>Quick start</li>
   <li>Requirements</li>
@@ -47,7 +47,7 @@ debug failed builds, see
     <li>Release preconditions and testing</li>
     <li>Release completion</li>
     </ol>
-   </li>  
+   </li>
   <li>New modules, Java 5, and Ant-only build problems</li>
   <li>Build Problems</li>
 </ol>
@@ -59,8 +59,8 @@ This is a minimal introduction to building and testing AspectJ.
 <pre>
   export CVS_ROOT=":pserver:anonymous@dev.eclipse.org:/home/technology"
   cvs co org.aspectj/modules</pre>
-If using Eclipse, check out the subdirectories of 
-<code>org.aspectj/modules</code> as Eclipse projects.  
+If using Eclipse, check out the subdirectories of
+<code>org.aspectj/modules</code> as Eclipse projects.
 Skip the  <code>aspectj-attic</code> module.
 
 <p/>Build an AspectJ distribution:
@@ -72,7 +72,7 @@ Install the distribution (e.g., into build/../aspectj-install):
 
 <pre>  java -jar ../aj-build/dist/aspectj-DEVELOPMENT.jar</pre>
 
-You can skip the GUI by specifying an existing, empty writable 
+You can skip the GUI by specifying an existing, empty writable
 target directory using <code>-to {targDir}</code>:
 
 <pre>  java -jar ../aj-build/dist/aspectj-DEVELOPMENT.jar -to .</pre>
@@ -83,46 +83,46 @@ Test it by running the build script in the examples directory:
   ../../lib/ant/bin/ant</pre>
 
 This should build and run the spacewar example.
-  
+
 <h3>Required sources, libraries, and tools</h3>
 	<p>
-		
+
 To build requires only the AspectJ project modules and Java VM's.
-All necessary libraries and tools are in the 
+All necessary libraries and tools are in the
 <a href="../lib/">lib</a> directory, including Ant.
 	</p>
 <p>To get the source, check out from CVS.  E.g., from the command line,
 </p>
-			
+
 <pre>
    export CVS_ROOT=":pserver:anonymous@dev.eclipse.org:/home/technology"
    cvs co org.aspectj/modules
 </pre>
 <p>
-	Eclipse users should check out each relevant subdirectory of 
+	Eclipse users should check out each relevant subdirectory of
  <code>org.aspectj/modules</code> as a project
-	(most have .project files).  
+	(most have .project files).
 </p>
 <p>
 Not all modules are required.
-The <code>aspectj-attic</code> module only has old code.		
+The <code>aspectj-attic</code> module only has old code.
 </p>
 
 <h3>Standard builds</h3>
 <h4>Overview</h4>
-The build system is designed to work standalone and support 
+The build system is designed to work standalone and support
 Eclipse and Ant.
 Each module is an Eclipse project, and all required libraries
 are in lib/.
 All build dependencies are read from Eclipse .classpath files
 and managed using an Ant builder task,
 so no Ant build scripts need to change when dependencies change.
-However, that means the modules (read: Eclipse projects) can only 
+However, that means the modules (read: Eclipse projects) can only
 do what the builder task understands.  Currently it expects
 release source files in <code>src</code> (or <code>java5-src</code>
-for Java 5 code) and test source files in 
+for Java 5 code) and test source files in
 <code>testsrc</code> (or <code>java5-testsrc</code>),
-and can handle Java and AspectJ projects.  
+and can handle Java and AspectJ projects.
 For more information on the build infrastructure and setup, see
 <a href="readme-build-module.html">readme-build-module.html</a>
 and <a href="#antInvariants">below</a>.
@@ -133,45 +133,45 @@ You should use the Ant in ../lib/ant.  Currently this is a vanilla
 distribution of Ant 1.6.3, but that might change.
 </p>
 <p>
-This <a href=".">build</a> directory has a master 
+This <a href=".">build</a> directory has a master
 <a href="build.xml">build.xml</a> script, and the modules have
 satellite <code>build.xml</code> which support building only that
-module.	
+module.
 The <a href="release">release</a> directory has scripts for doing
 release builds (in multiple VM's, with testing).  These are run by
 automated build and before any AspectJ distribution.
-Custom <code>build.xml</code> files are in	
+Custom <code>build.xml</code> files are in
 The <a href="../docs/build.xml">../docs/build.xml</a>,
 	<a href="../org.aspectj.lib/build-aspectjlib.xml">org.aspectj.lib/build-aspectjlib.xml</a>,
-and <a href="../eclipse.plugin/build.xml">../eclipse.plugin/build.xml</a>. 
+and <a href="../eclipse.plugin/build.xml">../eclipse.plugin/build.xml</a>.
 These are invoked by the master
 <a href="build.xml">build.xml</a> as needed.
 Other modules have generic <code>build.xml</code>'s that just
-use the master build file to run targets <code>compile</code> and 
+use the master build file to run targets <code>compile</code> and
 <code>test</code> for that module.
 (If you do <code>clean</code>, all binaries for all
 modules are cleaned.)
 </p>
 <p>
-The master <a href="build.xml">build.xml</a> 
-creates an AspectJ distribution in 
+The master <a href="build.xml">build.xml</a>
+creates an AspectJ distribution in
 	<a href="../aj-build/dist/aspectj-DEVELOPMENT.jar">
 		../aj-build/dist/aspectj-DEVELOPMENT.jar
 	</a>;
-You'll notice module jar results are put in 
+You'll notice module jar results are put in
 	<a href="../aj-build/jars">../aj-build/jars</a>,
 including <code>{module}.jar</code> and <code>{module}-test.jar</code>
-(for the release and test classes) and 
-<code>{module}-all.jar</code>, and	
-<code>{module}-test-all.jar</code> 
+(for the release and test classes) and
+<code>{module}-all.jar</code>, and
+<code>{module}-test-all.jar</code>
 (including all antecedant classes and libraries).
 See <a href="build.xml">build.xml</a> for other targets.
 </p>
 <p>
 For any build, you should create your own version of
-	<a href="local.properties">local.properties</a>, using 	
+	<a href="local.properties">local.properties</a>, using
 	<a href="sample.local.properties">sample.local.properties</a>
-as a template.  	
+as a template.
 When using the master <code>build.xml</code>,
 consider defining "build.config" to pass flags to the Ant
 builder.  E.g., to reuse Eclipse classes and log verbosely,
@@ -190,7 +190,7 @@ with verbose logging:
 </p>
 <pre>
   cd modules/build
-  ../lib/ant/bin/ant 
+  ../lib/ant/bin/ant
 </pre>
 
 <p>
@@ -210,7 +210,7 @@ To build and test the asm module from that module:
 </pre>
 
 <p>
-To build the test harness into 
+To build the test harness into
   <code>../aj-build/jars/testing-drivers-all.jar</code>:
 </p>
 <pre>
@@ -227,7 +227,7 @@ handle the .project and .classpath files in the modules/projects.)
 That will enable you
 to run the compiler or test harness from within Eclipse (see below),
 but it will not build the AspectJ release as Ant does.
-If you are making changes in Eclipse, you should set your default JRE 
+If you are making changes in Eclipse, you should set your default JRE
 to the minimum supported by the AspectJ tools (currently JDK 1.3)
 to avoid using later API's.
 You'll need to set some variables in your Eclipse environment;
@@ -246,10 +246,10 @@ currently these are:
 </ul>
 
 <h4>Running the Ant build scripts from Eclipse</h4>
-When running Ant from older versions of Eclipse, 
-be sure to replace the Eclipse Ant 
-libraries with ours.  In the Ant configuration, remove all jars 
-specified by Eclipse and add all the libraries in 
+When running Ant from older versions of Eclipse,
+be sure to replace the Eclipse Ant
+libraries with ours.  In the Ant configuration, remove all jars
+specified by Eclipse and add all the libraries in
 <a href="../lib/ant/lib">../lib/ant/lib</a>
 as well as in <a href="../lib/junit">../lib/junit</a>.
 (Do not add <code>../lib/build/build.jar</code>, which is
@@ -264,14 +264,14 @@ for more information.
 <h4>Using Eclipse to compile but Ant to assemble</h4>
 As mentioned above,
 assuming Eclipse is compiling the AspectJ modules successfully,
-you can use Ant to assemble the Eclipse-built .class files into a 
-product by including <code>useEclipseCompiles</code> in the 
+you can use Ant to assemble the Eclipse-built .class files into a
+product by including <code>useEclipseCompiles</code> in the
 <code>build.config</code>.  That reduces the build process
 to product assembly.
 (And of course you can run Ant from Eclipse as described above.)
 
 <h4>Running the compiler, browser, or harness from the command-line</h4>
-The build produces jar files in 
+The build produces jar files in
   <a href="../aj-build/jars/">../aj-build/jars/</a>,
 some of which have manifests specifying the main class, so they
 can be run using <code>java -jar {file} {arguments}</code>.
@@ -312,7 +312,7 @@ in the next build.
 It appears that sometimes these jar files are not close during the
 Eclipse session, which means they cannot be overwritten in new builds,
 even those run from a different Ant process.
-If you find that builds are silently failing, try deleting the 
+If you find that builds are silently failing, try deleting the
 build products.
 
 
@@ -320,15 +320,15 @@ build products.
 <p>
 Each module has a tree of JUnit tests in the <code>testsrc</code> directory.
 These parallel the <code>src</code> directories and contain roll-up suites
-for each package 
-  (<code>{module}/testsrc/{packagePath}/{package}Tests.java</code>) and 
-for the module as a whole  
-  (<code>{module}/testsrc/{module}ModuleTests.java</code>). 
+for each package
+  (<code>{module}/testsrc/{packagePath}/{package}Tests.java</code>) and
+for the module as a whole
+  (<code>{module}/testsrc/{module}ModuleTests.java</code>).
 </p>
 <p>
-The AspectJ project also has <i>additional</i> custom tests in the 
+The AspectJ project also has <i>additional</i> custom tests in the
 <a href="../tests">tests module</a>,
-mainly the compiler tests run by the harness in 
+mainly the compiler tests run by the harness in
   <a href="../tests/ajcTests.xml">ajcTests.xml</a>. <u>It is important
 to run these additional compiler tests (not covered by the JUnit
 suite) before and after any change to the compiler.</u>
@@ -337,7 +337,7 @@ suite) before and after any change to the compiler.</u>
 The module <a href="../run-all-junit-tests">run-all-junit-tests</a>
 refers to all the other modules and the compiler tests adapted through
 the <a href="../tests/src">../tests/src</a>.  So the easiest way to
-run the JUnit and compiler tests is to run the top-level suite 
+run the JUnit and compiler tests is to run the top-level suite
 <a href="../run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java">
 	RunTheseBeforeYouCommitTests</a>.
 </p>
@@ -365,17 +365,17 @@ on the classpath:
 <p>
 The assembled (<code>-all</code>) jar files include all antecedants,
 except for those "skipped" (like Ant and JUnit).
-(For more on skipped libraries, see 
+(For more on skipped libraries, see
 <a href="readme-build-module.html">readme-build-module.html</a>).
 </p>
 
 <h4>Using the test harness to run compiler tests</h4>
 <p>
-	
-The <a href="build.xml">build.xml</a> <code>build-harness-jar</code> 
+
+The <a href="build.xml">build.xml</a> <code>build-harness-jar</code>
 target builds a single jar with
-the AspectJ binaries and a test harness as the main class. 
-It reads test suite files like 
+the AspectJ binaries and a test harness as the main class.
+It reads test suite files like
    <a href="../tests/ajcTests.xml">../tests/ajcTests.xml</a>;
 use the -help flag to see available options.
 For more information, see
@@ -392,7 +392,7 @@ Release builds differ mainly in running
 from a clean, up-to-date tree and with correct build version values
 in <a href="local.properties">local.properties</a>, which
 will update <code>org.aspectj.bridge.Version</code>.
-Do not run using the <code>build.config</code> value 
+Do not run using the <code>build.config</code> value
 <code>useEclipseCompiles</code>,
 because this will include testing classes in the release libraries.
 See <a href="#version">Version synchronization</a> below
@@ -402,12 +402,12 @@ for more details on how the version is updated.
 <p/>
 Normally, we do releases only after fixing all high-priority
 (P1 and P2) bugs in the bug database
-  (<a href="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;priority=P1&amp;priority=P2">
+  (<a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;priority=P1&amp;priority=P2">
 All open AspectJ bugs with P1 and P2</a>).
-For bug fixes, associated tests in 
+For bug fixes, associated tests in
   <code>tests/ajcTestsFailing.xml</code> are fixed and moved to
   <code>tests/ajcTests.xml</code>.
-  
+
 
 <p/>Before a release, run the release tests as described in
   <a href="../tests/readme-release-tests.html">
@@ -415,8 +415,8 @@ For bug fixes, associated tests in
   (deprecated? using:
   <a href="../build/release-checklist.txt">
            ../build/release-checklist.txt</a>).
-  
-                                 
+
+
 <h4>Release completion</h4>
 When the release build is accepted,
 tag the tree with the release version
@@ -429,24 +429,24 @@ based on the release code.  E.g., from the command line:
 <p/>
 Pushing the release out to the web involves manually updating
 the web with the release files and documentation,
-  verifying the downloads and pages, 
+  verifying the downloads and pages,
   and sending any release notifications.
-  Save the release installer, test results, and any notes 
+  Save the release installer, test results, and any notes
   about deferred bugs or tests in
   <code>org.aspectj/releases/aspectj-{version}/</code>.
- 
+
 <p/>
 <hr/>
 <a name="antInvariants"/>
 <h3>New modules, Java 5, and Ant-only build problems</h3>
 <p>
-	To reiterate (and as described more fully in 
+	To reiterate (and as described more fully in
 	<a href="readme-build-module.html">readme-build-module.html</a>),
 	the build system introspects on module and the .classpath file
 	to determine how to build.  Further, it enforces stricter build
 	invariants than the Eclipse projects do; when your code works
 	in Eclipse but fails in the Ant, it's your responsibility to fix it
-	by following the build invariants below.	
+	by following the build invariants below.
 </p>
 <p>
 <p>What to do when adding a new module (i.e., eclipse project):
@@ -459,16 +459,16 @@ the web with the release files and documentation,
         <li>same use of known classpath variables/entries</li>
     </ol>
 	</li>
-	<li>Add module to those checked for copyright/license in 
+	<li>Add module to those checked for copyright/license in
         <a href="testsrc/org/aspectj/build/BuildModuleTests.java">
             testsrc/org/aspectj/build/BuildModuleTests.java
         </a>
 	</li>
     <li>Add module to module dependency tree as usual in Eclipse project properties</li>
     <li>If the module is to produce a jar visible in {AspectJ}/lib,
-        then add a zero-length file of the correct name to 
+        then add a zero-length file of the correct name to
         <a href="products/tools/dist/lib">products/tools/dist/lib</a>
-        and an alias to that file from the module name in 
+        and an alias to that file from the module name in
 		<a href="src/org/aspectj/internal/tools/build/Builder.properties">
 			Builder.properties</a>
     </li>
@@ -503,7 +503,7 @@ the web with the release files and documentation,
 	<li>Neither <code>testsrc</code> directory is used in production builds.
 	</li>
 	<li>
-		This only requires what's in the 
+		This only requires what's in the
 		<a href="../lib">../lib</a> directory and the usual Java VM's.
 		That means modules can only depend on each other and the libraries
 		in <a href="../lib">../lib</a>.
@@ -511,7 +511,7 @@ the web with the release files and documentation,
 	<li>Modules are built into jar files.  <code>{module.name}.jar</code>
 		includes only the module classes, and <code>{module.name}-all.jar</code>
 		includes the module classes plus any antecendant modules and any
-		required libraries not skipped (see below).  
+		required libraries not skipped (see below).
 	</li>
 	<li>A file <code>{module.name}/{module.name}.mf.txt</code>, if available,
 		will be used as the jar file manifest, after replacing certain
@@ -524,7 +524,7 @@ the web with the release files and documentation,
 		(Ant, JUnit, etc.).
 	</li>
 	<li>Test classes are excluded from the compile process for production builds.
-		These result in the same jar files; there is no way to 
+		These result in the same jar files; there is no way to
 		tell externally whether the test classes were stripped from a jar.
 	</li>
 	<li>ONLY resources specified as <code>resource.pattern</code> in
@@ -546,7 +546,7 @@ the web with the release files and documentation,
 	<li>Java 5 code is built in Ant only if JAVA_HOME points to Java 5 (or later).
 	</li>
 	<li>No normal code can depend on any Java 5 code.
-		The build system checks by building everything using the 
+		The build system checks by building everything using the
 		lowest VM supported by the tools.
 	</li>
 </ul>
@@ -581,16 +581,16 @@ Some build problems and fixes encountered in the past:
    if this is added as an ordinary (external jar), then the main
    ant build script will pick up the contents of graphics.jar and
    include it in the aspectj distribution (obvious clue, the size of
-   the built aspectjtools.jar doubles to about 10MB). Instead, from the 
+   the built aspectjtools.jar doubles to about 10MB). Instead, from the
    Java Build Path properties page of the project, select "Add Library"
    and add the JDK library. You now have to remove the JRE_LIB entry
    from the project or Eclipse complains about duplicate jar files
    in the path.
    </li>
-   <li>More generally, if you find extra classes in the assembled jars, 
-	most likely you have added unexpected libraries to the build, e.g., 
-	when adding libraries for the IBM JRE.  
-	To skip those, add them to the "skip.libraries" list in 
+   <li>More generally, if you find extra classes in the assembled jars,
+	most likely you have added unexpected libraries to the build, e.g.,
+	when adding libraries for the IBM JRE.
+	To skip those, add them to the "skip.libraries" list in
 	<a href="src/org/aspectj/internal/tools/build/Builder.properties">
 		src/org/aspectj/internal/tools/build/Builder.properties</a>.
 	These libraries will always be skipped for any module built this way;
diff --git a/build/release-checklist.txt b/build/release-checklist.txt
index 47dd2cb15..d5a8137e3 100644
--- a/build/release-checklist.txt
+++ b/build/release-checklist.txt
@@ -15,7 +15,7 @@ Before you begin... you will need:
 * A Linux box         distribution :      [                                   ]
 * An iMac (nice-to-have) JDK 1.4.x :      [                                   ]
 * Eclipse            version :            [                                   ]
-  
+
 * A pair of scissors (get an adult to help you with these)
 * Some sticky-backed plastic
 
@@ -33,23 +33,23 @@ Preparation:
 
 * Create a new directory under releases for this release                [   ]
    (e.g. releases/aspectj-1.1rc1)
-   
+
 * Save a copy of this file there as package-and-test-notes.txt          [   ]
-    
+
 * Edit build/build-properties.xml and set the version properties for this
   release                                                               [   ]
-  
-  e.g. 
-  
-      <property name="build.version"       value="1.1rc1"/> 
-      <property name="build.version.base"  value="1.1"/> 
-      <property name="build.version.long"  value="1.1 release candidate 1"/> 
-      <property name="build.version.short" value="1.1rc1"/> 
-       
+
+  e.g.
+
+      <property name="build.version"       value="1.1rc1"/>
+      <property name="build.version.base"  value="1.1"/>
+      <property name="build.version.long"  value="1.1 release candidate 1"/>
+      <property name="build.version.short" value="1.1rc1"/>
+
 * Edit org.aspectj.ajdt.core/src/org.aspectj.ajdt.ajc/messages.properties and
   set the version properties for this release                           [   ]
-  
-  e.g. 
+
+  e.g.
 
   ### AspectJ-specific messages
   configure.version = AspectJ Compiler 1.1rc1
@@ -58,14 +58,14 @@ Preparation:
   ### miscellaneous
   misc.usage = AspectJ Compiler 1.1 release candidate 1\n\
   ...
-    
+
 Build:
 ================================================================================
 
 * Ensure JAVA_HOME is set to point to your 1.3 JDK                      [   ]
      echo $JAVA_HOME       [                                                ]
-     
-     (even when you "Run Ant..." from eclipse, the value of JAVA_HOME is 
+
+     (even when you "Run Ant..." from eclipse, the value of JAVA_HOME is
      used rather than the JRE specified in your Eclipse settings).
 
 * When running ant, use the version in modules/lib/ant,
@@ -77,10 +77,10 @@ Build:
     $ ant clean                                                         [   ]
     $ ant fail-unless-boot-libraries-uptodate                           [   ]
     $ ant                                                               [   ]
-    
+
 * Save the build output (console log) as build-<version>.log.txt        [   ]
     (e.g. build-1.1rc1.log.txt)
-    
+
 * Save the built jar to the releases directory                          [   ]
   (releases/aspectj-<version>)
 
@@ -92,8 +92,8 @@ Pre-installation tests:
 
 * run junitModules.xml tests
 
-  - go to modules/tests/ and run 
-  
+  - go to modules/tests/ and run
+
      $ ant -f junitModules.xml {target} \
        -Daspectjrt.path=../aj-build/dist/tools/lib/aspectjrt.jar
 
@@ -101,88 +101,88 @@ Pre-installation tests:
 
      -- target = clean                                                  [   ]
      -- target = default                                                [   ]
-     
-  - Record any failures here (should be none)     
-     
+
+  - Record any failures here (should be none)
+
   - Save the test results as junitModules.report.zip                    [   ]
     (zip of eclipse/workspace/tests/bin/junitXmlOutput/html)
-    
-   
+
+
 * run Harness tests on the 1.3 vm (ajcTests.xml):
-   
+
     Where {harness} is
-    
+
       $ cd tests
-      $ {java-1.3} -jar ../aj-build/jars/testing-drivers-all.jar 
+      $ {java-1.3} -jar ../aj-build/jars/testing-drivers-all.jar
 
     Do:
 
       $ {harness} -release -logFail ajcTests.xml                        [   ]
-  
+
     -- save results in ajcTests-result-<version>-JDK13.txt              [   ]
         (e.g. ajcTests-result-1.1rc1-JDK13.txt)
-  
+
       -- record any failures (should be none) inline here.
-      
+
       $ {harness} -release -logFail -emacssym ajcTests.xml              [   ]
 
     -- save results in ajcTests-result-<version>-emacssym-JDK13.txt     [   ]
         (e.g. ajcTests-result-1.1rc1-emacssym-JDK13.txt)
-  
+
       -- record any failures (should be none) inline here.
-                  
+
 * run Harness tests on the 1.4 vm:
 
     Where {harness} is
-    
+
       $ cd tests
-      $ {java-1.4} -jar ../aj-build/jars/testing-drivers-all.jar 
+      $ {java-1.4} -jar ../aj-build/jars/testing-drivers-all.jar
 
     Do:
 
       $ {harness} -release -logFail ajcTests.xml                        [   ]
-  
+
     -- save results in ajcTests-result-<version>-JDK14.txt              [   ]
         (e.g. ajcTests-result-1.1rc1-JDK14.txt)
-  
+
       -- record any failures (should be none) inline here.
-      
+
       $ {harness} -release -logFail -emacssym ajcTests.xml              [   ]
 
     -- save results in ajcTests-result-<version>-emacssym-JDK14.txt     [   ]
         (e.g. ajcTests-result-1.1rc1-emacssym-JDK14.txt)
-  
+
       -- record any failures (should be none) inline here.
-                      
+
 * run Harness on ajcTestsFailing.xml
 
     Where {harness} is
-    
+
       $ cd tests
-      $ {java-1.3} -jar ../aj-build/jars/testing-drivers-all.jar 
+      $ {java-1.3} -jar ../aj-build/jars/testing-drivers-all.jar
 
     Do:
 
       $ {harness} -release -logFail ajcTestsFailing.xml                 [   ]
-  
+
     -- save results in ajcTestsFailing-result-<version>-JDK13.txt       [   ]
         (e.g. ajcTestsFailing-result-1.1rc1-JDK13.txt)
-  
-      -- record any failures inline here (should be none. ajcTestsFailing 
+
+      -- record any failures inline here (should be none. ajcTestsFailing
          should be empty for a final release.  Known exceptions are
          permissible for a non-final release.)
-         
-      
+
+
 Installation & Verification Tests
 ================================================================================
 
 * install from aspectj-<version>.jar as built above
 
     - verify version number and build date on splash screen             [   ]
-    
+
     - save screenshot of splash screen (not essential) as               [   ]
-        Installer-Splash-Screen.bmp (file format may vary)   
-        
+        Installer-Splash-Screen.bmp (file format may vary)
+
 * verify directory structure created ok                                 [   ]
 
 * check version in README-AspectJ.html                                  [   ]
@@ -225,7 +225,7 @@ Installation & Verification Tests
 
 * verify debug info included in class files
     - "javap -l org.aspectj.tools.ajc.Main" under jdk 1.4 or later      [   ]
-    
+
 * verify manual dates correct in docs                                   [   ]
 
 * verify api docs present and correct                                   [   ]
@@ -233,7 +233,7 @@ Installation & Verification Tests
 Product Testing
 ================================================================================
 
-These tests are a bit more rigorous and time-consuming. 
+These tests are a bit more rigorous and time-consuming.
 Run at your discretion
 
 * Compile AspectJ sources using AspectJ                                 [   ]
@@ -282,18 +282,18 @@ Release
 
 Once developer consensus is reached on the build:
 
-* commit all releases/aspectj-<version>/*.* files created during 
+* commit all releases/aspectj-<version>/*.* files created during
   this process                                                          [   ]
 
 * tag /home/technology/org.aspectj as vM_m_r_XX (e.g. v1_1_0_RC1)       [   ]
 
-* post aspectj-<version>.jar to 
+* post aspectj-<version>.jar to
     download.eclipse.org/technology/ajdt/aspectj-<version>.jar          [   ]
-    
-* download from 
-  http://download.eclipse.org/technology/ajdt/aspectj-<version>.jar
+
+* download from
+  https://download.eclipse.org/technology/ajdt/aspectj-<version>.jar
   and install                                                           [   ]
-  
+
 * post news article on project home page                                [   ]
 
 * post link on download page                                            [   ]
diff --git a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java
index 08b363f0a..988937744 100644
--- a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java
+++ b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java
@@ -457,7 +457,7 @@ class SamplesRenderer {
         + "is hereby granted if the publication acknowledges "
         + "the author by name and "
         + "the source by reference to the AspectJ project home page "
-        + "at http://eclipse.org/aspectj.</small></p>"
+        + "at https://eclipse.org/aspectj.</small></p>"
         + EOL;
 
     /** template algorithm to render */
diff --git a/build/src/main/java/org/aspectj/internal/tools/build/Util.java b/build/src/main/java/org/aspectj/internal/tools/build/Util.java
index 69582bb0a..74dd8d93b 100644
--- a/build/src/main/java/org/aspectj/internal/tools/build/Util.java
+++ b/build/src/main/java/org/aspectj/internal/tools/build/Util.java
@@ -334,7 +334,7 @@ public class Util {
      * features that we use.
      * sources:
      * http://www-128.ibm.com/developerworks/library/os-ecl-osgi/index.html
-     * http://help.eclipse.org/help30/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/osgi/org/osgi/framework/Constants.html
+     * https://help.eclipse.org/help30/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/osgi/org/osgi/framework/Constants.html
      */
     public static class OSGIBundle {
         public static final Name BUNDLE_NAME = new Name("Bundle-Name");
@@ -487,4 +487,3 @@ public class Util {
         }
     }
 }
-
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/intro.html b/build/src/main/resources/$installer$/org/aspectj/resources/intro.html
index d5b543705..c8992bac2 100644
--- a/build/src/main/resources/$installer$/org/aspectj/resources/intro.html
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/intro.html
@@ -6,12 +6,12 @@
 <p align="center">Version ${build.version.long} built on ${build.date}</p>
 <p>This installs the complete AspectJ 9 Development Kit (AJDK) distribution, with
 the compiler, aspect libraries, structure browser, ant tasks,
-documentation, and examples.  
+documentation, and examples.
 This distribution is covered by the Eclipse Public License v 2.0 (see
 https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt).
 <p>
 For IDE integrations or source code, see the project home page at
-http://eclipse.org/aspectj</p>
+https://eclipse.org/aspectj</p>
 
 
 <p>${copyright.allRights.from1998}</p>
diff --git a/docs/devGuideDB/ajbrowser.adoc b/docs/devGuideDB/ajbrowser.adoc
index b092ebad5..734545496 100644
--- a/docs/devGuideDB/ajbrowser.adoc
+++ b/docs/devGuideDB/ajbrowser.adoc
@@ -186,10 +186,10 @@ building from the browser, then please submit a bug report.
 ==== Known issues with the AspectJ browser
 
 For the most up-to-date information on known problems, see the
-http://bugs.eclipse.org/bugs[bug database] for unresolved
-http://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=Compiler&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[compiler
+https://bugs.eclipse.org/bugs[bug database] for unresolved
+https://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=Compiler&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[compiler
 bugs] or
-http://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=IDE&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[IDE
+https://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=IDE&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[IDE
 bugs] .
 
 * Memory and forking: Users email most about the browser task running
@@ -217,5 +217,5 @@ well.
 You can send email to aspectj-users@dev.eclipse.org. (Do join the list
 to participate!) We also welcome any bug reports, patches, and feature
 requests; you can submit them to the bug database at
-http://bugs.eclipse.org/bugs using the AspectJ product and IDE
+https://bugs.eclipse.org/bugs using the AspectJ product and IDE
 component.
diff --git a/docs/devGuideDB/antsupport.adoc b/docs/devGuideDB/antsupport.adoc
index 9a370d718..6c8217930 100644
--- a/docs/devGuideDB/antsupport.adoc
+++ b/docs/devGuideDB/antsupport.adoc
@@ -29,7 +29,7 @@ for more information and the 1.5.1 distribution. This release is
 source-compatible with Ant 1.3 and Ant 1.4, but the task sources must be
 compiled with those versions of the Ant libraries to be used under those
 versions of Ant. Sources are available under the Eclipse Public License
-v 2.0 at http://eclipse.org/aspectj.
+v 2.0 at https://eclipse.org/aspectj.
 
 In Ant 1.5, third-party tasks can be declared using a taskdef entry in
 the build script, to identify the name and classes. When declaring a
@@ -845,10 +845,10 @@ if possible).
 ==== Known issues with the Ant tasks
 
 For the most up-to-date information on known problems, see the
-http://bugs.eclipse.org/bugs[bug database] for unresolved
-http://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=Compiler&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[compiler
+https://bugs.eclipse.org/bugs[bug database] for unresolved
+https://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=Compiler&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[compiler
 bugs] or
-http://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=Ant&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[taskdef
+https://bugs.eclipse.org/bugs/buglist.cgi?&product=AspectJ&component=Ant&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[taskdef
 bugs] .
 
 When running Ant build scripts under Eclipse 2.x variants, you will get
@@ -874,5 +874,5 @@ they use in their scripts to pass VM options, e.g., ANT_OPTS=-Xmx128m).
 For questions, you can send email to aspectj-users@dev.eclipse.org. (Do
 join the list to participate!) We also welcome any bug reports, patches,
 and features; you can submit them to the bug database at
-http://bugs.eclipse.org/bugs using the AspectJ product and Ant
+https://bugs.eclipse.org/bugs using the AspectJ product and Ant
 component.
diff --git a/docs/devGuideDB/antsupport.xml b/docs/devGuideDB/antsupport.xml
index 7e0fdfbc0..85f856e1a 100644
--- a/docs/devGuideDB/antsupport.xml
+++ b/docs/devGuideDB/antsupport.xml
@@ -53,7 +53,7 @@
 	compiled with those versions of the Ant libraries to be used
 	under those versions of Ant.
 	Sources are available under the Eclipse Public License v 2.0
-	at <ulink url="http://eclipse.org/aspectj">http://eclipse.org/aspectj</ulink>.
+	at <ulink url="https://eclipse.org/aspectj">https://eclipse.org/aspectj</ulink>.
 	</para>
 	<para>
 	In Ant 1.5, third-party tasks can be declared using a taskdef entry in
@@ -1559,12 +1559,12 @@ Ant -Dbuild.compiler=org.aspectj.tools.ant.taskdefs.Ajc11CompilerAdapter
 		<para>
 		For the most up-to-date information on known problems,
 		see the
-		<ulink url="http://bugs.eclipse.org/bugs">bug database</ulink>
+		<ulink url="https://bugs.eclipse.org/bugs">bug database</ulink>
 		for unresolved
-		<ulink url="http://bugs.eclipse.org/bugs/buglist.cgi?&amp;product=AspectJ&amp;component=Compiler&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
+		<ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?&amp;product=AspectJ&amp;component=Compiler&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
 			compiler bugs
 			</ulink> or
-		<ulink url="http://bugs.eclipse.org/bugs/buglist.cgi?&amp;product=AspectJ&amp;component=Ant&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
+		<ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?&amp;product=AspectJ&amp;component=Ant&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
 			taskdef bugs
 			</ulink>.
 		</para>
@@ -1600,8 +1600,8 @@ Ant -Dbuild.compiler=org.aspectj.tools.ant.taskdefs.Ajc11CompilerAdapter
         (Do join the list to participate!)
         We also welcome any bug reports, patches, and features;
         you can submit them to the bug database at
-        <ulink url="http://bugs.eclipse.org/bugs">
-           http://bugs.eclipse.org/bugs</ulink>
+        <ulink url="https://bugs.eclipse.org/bugs">
+           https://bugs.eclipse.org/bugs</ulink>
         using the AspectJ product and Ant component.
 		</para>
 	</sect2>
@@ -1613,4 +1613,3 @@ Ant -Dbuild.compiler=org.aspectj.tools.ant.taskdefs.Ajc11CompilerAdapter
 <!-- sgml-local-ecat-files: devguide.ced -->
 <!-- sgml-parent-document:("devguide.sgml" "book" "refentry") -->
 <!-- End: -->
-
diff --git a/docs/devGuideDB/devguide.xml b/docs/devGuideDB/devguide.xml
index 90e6e4aec..f526e5e87 100644
--- a/docs/devGuideDB/devguide.xml
+++ b/docs/devGuideDB/devguide.xml
@@ -39,11 +39,11 @@
         				AspectJ Programming Guide</ulink>,
               the documentation available with the AspectJ support available for
 		        various integrated development environments (e.g.,
-              <ulink url="http://eclipse.org/ajdt">Eclipse AJDT</ulink>),
+              <ulink url="https://eclipse.org/ajdt">Eclipse AJDT</ulink>),
               and the most-recent documentation available from
               the AspectJ project page, at
-              	<ulink url="http://eclipse.org/aspectj">
-              				http://eclipse.org/aspectj</ulink>.
+              	<ulink url="https://eclipse.org/aspectj">
+              				https://eclipse.org/aspectj</ulink>.
       </para>
     </abstract>
   </bookinfo>
diff --git a/docs/devGuideDB/ltw.adoc b/docs/devGuideDB/ltw.adoc
index e5ce4ba54..81d25ee3c 100644
--- a/docs/devGuideDB/ltw.adoc
+++ b/docs/devGuideDB/ltw.adoc
@@ -178,7 +178,7 @@ abstract methods). The following example shows a simple aop.xml file:
 ....
 
 The DTD defining the format of this file is available here:
-http://www.eclipse.org/aspectj/dtd/aspectj.dtd.
+https://www.eclipse.org/aspectj/dtd/aspectj.dtd.
 
 An aop.xml file contains two key sections: `aspects` defines one or more
 aspects to the weaver and controls which aspects are to be used in the
diff --git a/docs/devGuideDB/ltw.xml b/docs/devGuideDB/ltw.xml
index 969070f44..79569ad38 100644
--- a/docs/devGuideDB/ltw.xml
+++ b/docs/devGuideDB/ltw.xml
@@ -196,7 +196,7 @@
 
             <para>
                 The DTD defining the format of this file is available here:
-                http://www.eclipse.org/aspectj/dtd/aspectj.dtd.
+                https://www.eclipse.org/aspectj/dtd/aspectj.dtd.
             </para>
             <para>
                 An aop.xml file contains two key sections: <literal>aspects</literal> defines one
diff --git a/docs/devGuideDB/tools-intro.adoc b/docs/devGuideDB/tools-intro.adoc
index 92508cbed..329378b2a 100644
--- a/docs/devGuideDB/tools-intro.adoc
+++ b/docs/devGuideDB/tools-intro.adoc
@@ -6,7 +6,7 @@
 
 The xref:../progguide/index.html[AspectJ Programming Guide] describes
 the AspectJ language. This guide describes the AspectJ tools produced by
-the AspectJ team on http://eclipse.org/aspectj. The AspectJ tools
+the AspectJ team on https://eclipse.org/aspectj. The AspectJ tools
 include - ajc, the compiler/weaver; ajdoc, a documentation tool;
 ajbrowser, a crosscutting code viewer; Ant support for ajc; and
 load-time weaving support. These tools are delivered in the library
@@ -14,7 +14,7 @@ folder of the AspectJ tools installation, mainly in `aspectjtools.jar`
 (tools) and `aspectjrt.jar` (runtime). This guide does not describe the
 Eclipse AspectJ development tools (AJDT). That is produced by another
 team (sharing some members) on
-http://eclipse.org/aspectj[http://eclipse.org/ajdt]. AJDT is delivered
+https://eclipse.org/aspectj[https://eclipse.org/ajdt]. AJDT is delivered
 as an Eclipse plugin, incorporating the classes in the AspectJ tools
 libraries along with the Eclipse plugin interface classes.
 
diff --git a/docs/devGuideDB/tools-intro.xml b/docs/devGuideDB/tools-intro.xml
index bc6051489..521fac7a1 100644
--- a/docs/devGuideDB/tools-intro.xml
+++ b/docs/devGuideDB/tools-intro.xml
@@ -9,7 +9,7 @@
         describes the AspectJ language.  This guide describes the AspectJ
         tools produced by the AspectJ
         team on
-         <ulink url="http://eclipse.org/aspectj">http://eclipse.org/aspectj</ulink>.
+         <ulink url="https://eclipse.org/aspectj">https://eclipse.org/aspectj</ulink>.
         The AspectJ tools include
         - ajc, the compiler/weaver;
         ajdoc, a documentation tool; ajbrowser, a crosscutting code viewer;
@@ -19,7 +19,7 @@
         <literal>aspectjrt.jar</literal> (runtime).
         This guide does not describe the Eclipse AspectJ development tools
         (AJDT).  That is produced by another team (sharing some members) on
-         <ulink url="http://eclipse.org/aspectj">http://eclipse.org/ajdt</ulink>.
+         <ulink url="https://eclipse.org/aspectj">https://eclipse.org/ajdt</ulink>.
         AJDT is delivered as an Eclipse plugin, incorporating the classes in
         the AspectJ tools libraries along with the Eclipse plugin interface
         classes.
diff --git a/docs/developer/language.adoc b/docs/developer/language.adoc
index c97ef8d11..28a3f7548 100644
--- a/docs/developer/language.adoc
+++ b/docs/developer/language.adoc
@@ -3,16 +3,16 @@
 === User-suggested New Language Features
 
 * `-` wildcard
-** http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00717.html
+** https://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00717.html
 ** https://bugs.eclipse.org/bugs/show_bug.cgi?id=34054#c2
 
 * Class cast pointcut
-** http://dev.eclipse.org/mhonarc/lists/aspectj-users/msg01479.html
+** https://dev.eclipse.org/mhonarc/lists/aspectj-users/msg01479.html
 
 * Extensible pointcuts, abstract pointcuts, and interfaces
-** http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00458.html
-** http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00467.html +
- 
+** https://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00458.html
+** https://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00467.html +
+
 === Key Language Design Properties
 
 ==== Orthogonal join point model
diff --git a/docs/dist/LICENSE-AspectJ.adoc b/docs/dist/LICENSE-AspectJ.adoc
index 4aad458a8..ca18dbede 100644
--- a/docs/dist/LICENSE-AspectJ.adoc
+++ b/docs/dist/LICENSE-AspectJ.adoc
@@ -1,7 +1,7 @@
 == *AspectJ^TM^ Compiler and Core Tools License*
 
 This is a binary-only release. Source code is available from
-http://eclipse.org/aspectj
+https://eclipse.org/aspectj
 
 The Eclipse Foundation makes available all content in this distribution
 ("Content"). Unless otherwise indicated below, the Content is provided
@@ -17,7 +17,7 @@ use of any object code in the Content. Check the Redistributor's license
 that was provided with the Content. If no such license exists, contact
 the Redistributor. Unless otherwise indicated below, the terms and
 conditions of the EPL still apply to any source code in the Content and
-such source code may be obtained at link:/[http://www.eclipse.org].
+such source code may be obtained at link:/[https://www.eclipse.org].
 
 === Third Party Content
 
diff --git a/docs/dist/LICENSE-AspectJ.html b/docs/dist/LICENSE-AspectJ.html
index c280f86ec..9442561a9 100644
--- a/docs/dist/LICENSE-AspectJ.html
+++ b/docs/dist/LICENSE-AspectJ.html
@@ -13,43 +13,43 @@
 
 <p>This is a binary-only release.&nbsp; Source code
 is available from
-<a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p>
+<a href="https://eclipse.org/aspectj">https://eclipse.org/aspectj</a></p>
 
-<p>The Eclipse Foundation makes available all content in this distribution ("Content").  
+<p>The Eclipse Foundation makes available all content in this distribution ("Content").
 		Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-		Eclipse Public License Version v 2.0 ("EPL").  A copy of the EPL is available 
+		Eclipse Public License Version v 2.0 ("EPL").  A copy of the EPL is available
 		at <a href="../../org/documents/epl-2.0/EPL-2.0.txt">https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</a>.
 		For purposes of the EPL, "Program" will mean the Content.</p>
 
-		<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+		<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
 		being redistributed by another party ("Redistributor") and different terms and conditions may
-		apply to your use of any object code in the Content.  Check the Redistributor's license 
+		apply to your use of any object code in the Content.  Check the Redistributor's license
 		that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
 		indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-		and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
+		and such source code may be obtained at <a href="/">https://www.eclipse.org</a>.</p>
+
 
-		
 		<h3>Third Party Content</h3>
-		<p>The Content includes items that have been sourced from third parties as set out below. If you 
-		did not receive this Content directly from the Eclipse Foundation, the following is provided 
-		for informational purposes only, and you should look to the Redistributor's license for 
+		<p>The Content includes items that have been sourced from third parties as set out below. If you
+		did not receive this Content directly from the Eclipse Foundation, the following is provided
+		for informational purposes only, and you should look to the Redistributor's license for
 		terms and conditions of use.</p>
 		<em>
 
 		<h4>BCEL v5.1</h4>
 		<p>This product contains software developed by the
          Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p>
- 
+
 		<p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
 		BCEL is available at <a href="https://commons.apache.org/bcel/">https://commons.apache.org/bcel/</a>. Source
 		code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code
 		is made available under the Apache Software License v1.1</p>
-		
-		<h4>ASM v2.2.1</h4> 
+
+		<h4>ASM v2.2.1</h4>
 		<p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>)
-		The source code for ASM is available from the ObjectWeb download site at 
-		<a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. 
-		<p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. 
+		The source code for ASM is available from the ObjectWeb download site at
+		<a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>.
+		<p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>.
 		The license is also reproduced here:
 		</p>
 
diff --git a/docs/dist/doc/README-11.adoc b/docs/dist/doc/README-11.adoc
index a56521fac..cd744c343 100644
--- a/docs/dist/doc/README-11.adoc
+++ b/docs/dist/doc/README-11.adoc
@@ -254,7 +254,7 @@ the batch-build mode of the new compiler.
 
 The AspectJ tools sources are available under the
 https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt[Eclipse Public
-License v 2.0] in the Git repository at http://eclipse.org/aspectj. For
+License v 2.0] in the Git repository at https://eclipse.org/aspectj. For
 more information, see the FAQ entry on
 faq.html#q:buildingsource[building sources].
 
@@ -267,7 +267,7 @@ AspectJ 1.0 had many distributions - for the tools, the documentation,
 each IDE support package, their respective sources, and the Ant tasks -
 because they came under different licenses. All of AspectJ 1.1 is
 licensed under the CPL 1.0, so the tools, Ant tasks, and documentation
-are all in one distribution available from http://eclipse.org/aspectj.
+are all in one distribution available from https://eclipse.org/aspectj.
 To retain their MPL 1.1 license, Ajde for
 http://aspectj4emacs.sourceforge.net/[Emacs],
 http://aspectj4netbean.sourceforge.net/[NetBeans] and
@@ -1364,19 +1364,19 @@ is what the target matching will handle.
 The AspectJ 1.1.0 release contains a small number of known limitations
 relative to the AspectJ 1.1 language. For the most up-to-date
 information about known limitations in an AspectJ 1.1 release, see the
-bug database at http://bugs.eclipse.org/bugs, especially the open bugs
+bug database at https://bugs.eclipse.org/bugs, especially the open bugs
 for the
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[compiler],
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=IDE&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[IDE
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[compiler],
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=IDE&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[IDE
 support],
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Doc&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[documentation],
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Doc&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[documentation],
 and
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Ant&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[Ant
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Ant&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[Ant
 tasks]. Developers should know about bugs marked with the "info" keyword
 because those bugs reflect failures to implement the 1.1 language
 perfectly. These might be fixed during the 1.1 release cycle; find them
 using the query
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info
 For ajc's 1.1 implementation limitations, see
 link:progguide/implementation.html[Programming Guide Appendix:
 "Implementation Notes"].
diff --git a/docs/dist/doc/README-12.adoc b/docs/dist/doc/README-12.adoc
index 92b46eb55..0cbc3b93c 100644
--- a/docs/dist/doc/README-12.adoc
+++ b/docs/dist/doc/README-12.adoc
@@ -99,7 +99,7 @@ AJDT (AspectJ support for Eclipse). Amongst the many improvements, we
 will have full eager parsing support that avoids the need to keep the
 whole structure model of a project in memory, hopefully making AJDT much
 less memory hungry and much slicker to use. For more details see the
-http://www.eclipse.org/ajdt[AJDT project website].
+https://www.eclipse.org/ajdt[AJDT project website].
 
 '''''
 
diff --git a/docs/dist/doc/README-150.adoc b/docs/dist/doc/README-150.adoc
index 292048467..1fddafaf3 100644
--- a/docs/dist/doc/README-150.adoc
+++ b/docs/dist/doc/README-150.adoc
@@ -12,8 +12,8 @@ AspectJ 5].
 
 Some of the other documentation has not been updated for AspectJ 5. For
 the latest documentation, see
-http://eclipse.org/aspectj/doc/next/index.html, linked off
-http://eclipse.org/aspectj/docs.php[the AspectJ documentation home page].
+https://eclipse.org/aspectj/doc/next/index.html, linked off
+https://eclipse.org/aspectj/docs.php[the AspectJ documentation home page].
 
 For information on bug fixes in AspectJ 5 v1.5.0, see the
 link:changes.html[changes] document.
diff --git a/docs/dist/doc/README-153.adoc b/docs/dist/doc/README-153.adoc
index 1b8344e53..d5d9a228c 100644
--- a/docs/dist/doc/README-153.adoc
+++ b/docs/dist/doc/README-153.adoc
@@ -83,7 +83,7 @@ sophisticated. To help us work on problems in these scenarios we have
 added a tracing and logging framework and improved our dump mechanism.
 These traces and dumps can be attached to bug reports. In AspectJ 1.5.3
 we have included some
-http://www.eclipse.org/aspectj/doc/released/pdguide/index.html[documentation]
+https://www.eclipse.org/aspectj/doc/released/pdguide/index.html[documentation]
 on how to configure these new features. Don't be surprised if you get
 asked for an AspectJ trace on a future bug report!
 
diff --git a/docs/dist/doc/README-160.adoc b/docs/dist/doc/README-160.adoc
index 492c56fc4..5e37c8efb 100644
--- a/docs/dist/doc/README-160.adoc
+++ b/docs/dist/doc/README-160.adoc
@@ -25,7 +25,7 @@ incremental builds are required when project dependencies change. The
 result is that the compiler will more frequently do an incremental build
 rather than falling back to doing a full build. Some basic performance
 findings can be seen in
-http://dev.eclipse.org/mhonarc/lists/aspectj-users/msg09002.html[this
+https://dev.eclipse.org/mhonarc/lists/aspectj-users/msg09002.html[this
 mailing list post].
 
 ==== Parameter annotation matching
diff --git a/docs/dist/doc/README-162.adoc b/docs/dist/doc/README-162.adoc
index 081c908d1..a6b88ffee 100644
--- a/docs/dist/doc/README-162.adoc
+++ b/docs/dist/doc/README-162.adoc
@@ -75,7 +75,7 @@ The AspectJ changes are done to support this, but we are still bedding
 them down in AJDT. If you want to see numbers like those above you need
 to install the latest AJDT dev builds for Eclipse 3.4 (an AJDT 1.6.1 dev
 build from the dev update site:
-http://download.eclipse.org/tools/ajdt/34/dev/update ) and then after
+https://download.eclipse.org/tools/ajdt/34/dev/update ) and then after
 starting Eclipse, select 'Window>Preferences' and in the AspectJ tab
 select 'Incremental Compiler Optimizations'. Let us know how you get on!
 When it has had enough testing it will be made the default and then is
diff --git a/docs/dist/doc/README-163.adoc b/docs/dist/doc/README-163.adoc
index f01648abe..1609eb35f 100644
--- a/docs/dist/doc/README-163.adoc
+++ b/docs/dist/doc/README-163.adoc
@@ -78,7 +78,7 @@ The JDT World should be completed in the 1.6.4 timeframe and that will
 surface as benefits in AJDT, possibly leading to better LTW tooling.
 Some improved syntax for intertype declarations is a possible candidate
 feature (see discussion in
-http://dev.eclipse.org/mhonarc/lists/aspectj-users/msg10208.html[this
+https://dev.eclipse.org/mhonarc/lists/aspectj-users/msg10208.html[this
 mailing list thread]). A possible introduction of a code style syntax
 for the mixin style that is @DeclareParents (and a renaming of
 @DeclareParents to perhaps DeclareMixin or DeclareDelegate).
diff --git a/docs/dist/doc/README-164.adoc b/docs/dist/doc/README-164.adoc
index b7c9bbe01..dc3a71816 100644
--- a/docs/dist/doc/README-164.adoc
+++ b/docs/dist/doc/README-164.adoc
@@ -198,7 +198,7 @@ public static SomeInterface createDelegate(Object instance) {
 ....
 
 More examples are
-http://www.eclipse.org/aspectj/doc/released/adk15notebook/ataspectj-itds.html[here
+https://www.eclipse.org/aspectj/doc/released/adk15notebook/ataspectj-itds.html[here
 in the online documentation].
 
 Going forward attempts will be made to try and make @DeclareParents
diff --git a/docs/dist/doc/index.adoc b/docs/dist/doc/index.adoc
index 0d8f8e564..35ac9dfb9 100644
--- a/docs/dist/doc/index.adoc
+++ b/docs/dist/doc/index.adoc
@@ -5,7 +5,7 @@ AspectJ^TM^ is a seamless aspect-oriented extension to
 Java^TM^. The compiler and development tools are available
 under an open-source license, require Java 1.3 to run, and produce code
 that runs in JDK 1.1 and later VM's. For the latest materials, see
-http://eclipse.org/aspectj. Not all of these materials have been updated
+https://eclipse.org/aspectj. Not all of these materials have been updated
 for AspectJ 5.
 
 [cols=",",]
@@ -21,12 +21,12 @@ link:pdguide/index.html[problem diagnosis] guides,
 link:runtime-api/index.html[API] and link:examples/[example code].
 
 |xref:#distributions[distributions]
-|http://eclipse.org/aspectj[AspectJ]; development environment support
-for http://eclipse.org/ajdt[Eclipse].
+|https://eclipse.org/aspectj[AspectJ]; development environment support
+for https://eclipse.org/ajdt[Eclipse].
 
 |xref:#resources[resources] |http://aosd.net[aosd.net];
-http://eclipse.org/aspectj[AspectJ project] the bug
-http://bugs.eclipse.org/bugs[db], and mailing lists for
+https://eclipse.org/aspectj[AspectJ project] the bug
+https://bugs.eclipse.org/bugs[db], and mailing lists for
 mailto:aspectj-users@eclipse.org[users] and
 mailto:aspectj-dev@eclipse.org[developers].
 
@@ -128,19 +128,19 @@ updating.
 [cols=",",options="header",]
 |===
 |Distributions |Description
-|http://eclipse.org/aspectj[AspectJ] |The AspectJ distribution contains
+|https://eclipse.org/aspectj[AspectJ] |The AspectJ distribution contains
 binaries for the compiler, structure browser, and Ant taskdefs, as well
 as the documentation and examples.
 
-|http://eclipse.org/aspectj[AspectJ] source code |Source code for
+|https://eclipse.org/aspectj[AspectJ] source code |Source code for
 AspectJ is available under the open-source
 https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt[Eclipse Public
 License v 2.0] license from the Git repositories for the AspectJ
 project. See the faq.html#q:buildingsource[FAQ entry].
 
-|http://eclipse.org/ajdt[AspectJ for Eclipse] |AspectJ Development
+|https://eclipse.org/ajdt[AspectJ for Eclipse] |AspectJ Development
 Environment support for Eclipse is available under Eclipse Public
-License v 1.0 from the eclipse.org project site http://eclipse.org/ajdt
+License v 1.0 from the eclipse.org project site https://eclipse.org/ajdt
 |===
 
 [[resources]]
@@ -156,22 +156,22 @@ discuss issues with developing the AspectJ tools on
 aspectj-dev@eclipse.org. To get occasional emails about AspectJ releases
 and relevant events, subscribe to aspectj-announce@eclipse.org. To view
 list archives or subscribe to the list, go to
-http://eclipse.org/aspectj[the AspectJ home page]. To find archived
+https://eclipse.org/aspectj[the AspectJ home page]. To find archived
 emails, use the Eclipse site
-http://www.eclipse.org/search/search.cgi[search page].
+https://www.eclipse.org/search/search.cgi[search page].
 
-|http://bugs.eclipse.org/bugs[Bug database] |Use the Eclipse project's
+|https://bugs.eclipse.org/bugs[Bug database] |Use the Eclipse project's
 Bugzilla database to view and submit bugs against the AspectJ product
 components
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler[Compiler]
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler[Compiler]
 (for the AspectJ compiler, ajc)
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=IDE[IDE]
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=IDE[IDE]
 (for AJBrowser and AJDE bugs),
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Ant[Ant]
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Ant[Ant]
 (for the Ant tasks), and
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Docs[Docs]
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Docs[Docs]
 (for the documentation). Bugs all users should know about are
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info[flagged
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info[flagged
 with the "info" keyword]. See the faq.html#q:ajcbugs[FAQ entry] for
 instructions on submitting compiler bugs.
 
@@ -193,7 +193,7 @@ pointcuts, concepts AOP adds to OOP. To read about how the
 link:examples/[examples] work, see the
 link:progguide/examples.html[Examples] section in the
 link:progguide/index.html[Programming Guide]. View and navigate the
-crosscutting structure using http://eclipse.org/ajdt[AJDT]; if you can't
+crosscutting structure using https://eclipse.org/ajdt[AJDT]; if you can't
 use Eclipse, try the `ajbrowser` structure viewer, as described in the
 link:devguide/ajbrowser.html[AspectJ Browser] section of the
 link:devguide/index.html[Development Environment Guide].
diff --git a/docs/dist/doc/index.html b/docs/dist/doc/index.html
index e8e2d2387..7c52cde81 100644
--- a/docs/dist/doc/index.html
+++ b/docs/dist/doc/index.html
@@ -14,7 +14,7 @@
     an open-source license, require Java 1.3 to run, and produce
     code that runs in JDK 1.1 and later VM's.
     For the latest materials, see
-    <a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a>.
+    <a href="https://eclipse.org/aspectj">https://eclipse.org/aspectj</a>.
     Not all of these materials have been updated for AspectJ 5.
 <p/>
 
@@ -32,16 +32,16 @@
        <a href="examples/">example code</a>.
 	   </td></tr>
     <tr><td><a href="#distributions">distributions</a></td><td>
-        <a href="http://eclipse.org/aspectj">AspectJ</a>;
+        <a href="https://eclipse.org/aspectj">AspectJ</a>;
         development environment support for
-        <a href="http://eclipse.org/ajdt">Eclipse</a>
+        <a href="https://eclipse.org/ajdt">Eclipse</a>
         and
         <a href="https://jdeveloperaop.dev.java.net/">JDeveloper</a>.
         </td></tr>
     <tr><td><a href="#resources">resources</a></td><td>
        <a href="http://aosd.net">aosd.net</a>;
-       <a href="http://eclipse.org/aspectj">AspectJ project</a>
-       the bug <a href="http://bugs.eclipse.org/bugs">db</a>,
+       <a href="https://eclipse.org/aspectj">AspectJ project</a>
+       the bug <a href="https://bugs.eclipse.org/bugs">db</a>,
        and mailing lists for
        <a href="mailto:aspectj-users@eclipse.org">users</a> and
        <a href="mailto:aspectj-dev@eclipse.org">developers</a>.
@@ -209,14 +209,14 @@
 <h3>AspectJ distributions</h3>
 <table border="1">
 <tr> <th>Distributions</th><th>Description</th></tr>
-<tr> <td><a href="http://eclipse.org/aspectj">AspectJ</a>
+<tr> <td><a href="https://eclipse.org/aspectj">AspectJ</a>
      </td>
      <td>The AspectJ distribution contains binaries for the
          compiler, structure browser, and Ant taskdefs,
          as well as the documentation and examples.
          </td>
      </tr>
-<tr> <td><a href="http://eclipse.org/aspectj">AspectJ</a> source code
+<tr> <td><a href="https://eclipse.org/aspectj">AspectJ</a> source code
      </td>
      <td>Source code for AspectJ is available
          under the open-source
@@ -227,13 +227,13 @@
          </td>
      </tr>
 
-<tr> <td><a href="http://eclipse.org/ajdt">AspectJ for Eclipse</a>
+<tr> <td><a href="https://eclipse.org/ajdt">AspectJ for Eclipse</a>
      </td>
      <td>AspectJ Development Environment support for
          Eclipse is available under Eclipse Public License v 1.0
          from the eclipse.org project site
-         <a href="http://eclipse.org/ajdt">
-                  http://eclipse.org/ajdt</a>
+         <a href="https://eclipse.org/ajdt">
+                  https://eclipse.org/ajdt</a>
          </td>
      </tr>
 
@@ -270,26 +270,26 @@
          and relevant events, subscribe to
          <tt>aspectj-announce@eclipse.org</tt>.
          To view list archives or subscribe to the list, go to
-         <a href="http://eclipse.org/aspectj">
+         <a href="https://eclipse.org/aspectj">
                  the AspectJ home page</a>.
 		 To find archived emails, use the Eclipse site
-		 <a href="http://www.eclipse.org/search/search.cgi">search page</a>.
+		 <a href="https://www.eclipse.org/search/search.cgi">search page</a>.
 	</td></tr>
-<tr> <td><a href="http://bugs.eclipse.org/bugs">Bug database</a>
+<tr> <td><a href="https://bugs.eclipse.org/bugs">Bug database</a>
      </td>
      <td>Use the Eclipse project's Bugzilla database
      to view and submit bugs against the AspectJ product components
-     <a href="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler">
+     <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler">
          Compiler</a> (for the AspectJ compiler, ajc)
-     <a href="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=IDE">
+     <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=IDE">
          IDE</a> (for AJBrowser and AJDE bugs),
-     <a href="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Ant">
+     <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Ant">
          Ant</a> (for the Ant tasks),
      and
-     <a href="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Docs">
+     <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Docs">
          Docs</a> (for the documentation).
      Bugs all users should know about are
-     <a href="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;keywords=info">
+     <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;keywords=info">
       flagged with the "info" keyword</a>.
      See the
      <a href="faq.html#q:ajcbugs">
@@ -322,7 +322,7 @@
     see the <a href="progguide/examples.html">Examples </a> section
     in the <a href="progguide/index.html">Programming Guide</a>.
     View and navigate the crosscutting structure using
-    <a href="http://eclipse.org/ajdt">AJDT (AspectJ Development Tools)
+    <a href="https://eclipse.org/ajdt">AJDT (AspectJ Development Tools)
     in Eclipse IDE</a>. IntelliJ IDEA also offers AspectJ and Spring AOP
     support.
 <p/>
diff --git a/docs/faq/faq.adoc b/docs/faq/faq.adoc
index 06377de04..7b017cd21 100644
--- a/docs/faq/faq.adoc
+++ b/docs/faq/faq.adoc
@@ -85,11 +85,11 @@ https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt[Eclipse Public
 License v 2.0].
 
 AspectJ 1.5.2 through 1.9.6 source code and documentation is available
-under the http://www.eclipse.org/org/documents/epl-v10.php[Eclipse
+under the https://www.eclipse.org/org/documents/epl-v10.php[Eclipse
 Public License v 1.0].
 
 AspectJ 1.1 through 1.5.1 source code and documentation is available
-under the http://eclipse.org/legal/cpl-v10.html[Common Public License
+under the https://eclipse.org/legal/cpl-v10.html[Common Public License
 1.0].
 
 The AspectJ 1.0 tools are open-source software available under the
@@ -102,7 +102,7 @@ the https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt[Eclipse
 Public License].
 
 For answers to common licensing questions, see the
-http://www.eclipse.org/legal/eplfaq.php[Eclipse Public License FAQ].
+https://www.eclipse.org/legal/eplfaq.php[Eclipse Public License FAQ].
 
 *Q:* What is the AspectJ Project?
 
@@ -111,13 +111,13 @@ http://www.parc.xerox.com[Xerox Palo Alto Research Center] as funded by
 Xerox, a U.S. Government grant (NISTATP), and a DARPA contract.
 
 It has evolved through open-source releases to a strong user community
-and now operates as an open source project at http://eclipse.org/aspectj
+and now operates as an open source project at https://eclipse.org/aspectj
 The AspectJ team works closely with the community to ensure AspectJ
 continues to evolve as an effective aspect-oriented programming language
 and tool set.
 
 The latest release is 1.2 which can be downloaded from the
-http://eclipse.org/aspectj[AspectJ project page], including sources as
+https://eclipse.org/aspectj[AspectJ project page], including sources as
 described #q:buildingsource[Q:How do I get and compile the source code
 for AspectJ?]. Development is focused on supporting applications,
 improving quality and performance, enhancing integration with IDE's, and
@@ -137,7 +137,7 @@ must be able to reach classes in the small (< 100K) runtime library
 
 *Q:* How do I download and install AspectJ?
 
-*A:* From AspectJ's http://eclipse.org/aspectj[web page] , download the
+*A:* From AspectJ's https://eclipse.org/aspectj[web page] , download the
 AspectJ distribution. The `jar` file is installed by executing
 
 [source, text]
@@ -224,7 +224,7 @@ AJDE is a set of API's providing the basis for the following development
 tool integrations:
 
 * Eclipse (version 2.0) in the Eclipse AspectJ Development Tools project
-http://eclipse.org/ajdt
+https://eclipse.org/ajdt
 * Emacs (GNU version 20.3) and XEmacs (version 21.1 on Unix and 21.4 on
 Windows), in the SourceForge AspectJ for Emacs project
 http://aspectj4emacs.sourceforge.net
@@ -495,7 +495,7 @@ interceptors. For AspectJ examples of configurable or
 reflection-dependent programs, see the sample code linked off the
 AspectJ documentation page or the examples discussed on the mailing
 list, e.g.,
-http://dev.eclipse.org/mhonarc/lists/aspectj-users/msg02151.html[Incremental
+https://dev.eclipse.org/mhonarc/lists/aspectj-users/msg02151.html[Incremental
 and runtime weaving support?].
 
 *Q:* What is the relationship between AOP and XP (extreme programming
@@ -929,13 +929,13 @@ developer mailing list, `aspectj-dev@eclipse.org`.
 To find out about known issues, see the
 link:progguide/implementation.html[AspectJ Programming Guide Appendix,
 "Implementation Notes"] and the AspectJ bugs in the database at
-http://bugs.eclipse.org/bugs (using the product `AspectJ`). Here are
+https://bugs.eclipse.org/bugs (using the product `AspectJ`). Here are
 direct links to
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[view
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED[view
 open compiler bugs],
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ[view all
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ[view all
 Aspectj bugs (open or closed)], or
-http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ[add new
+https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ[add new
 bugs].
 
 *Q:* What mailing lists are there?
@@ -954,7 +954,7 @@ answer questions about what's possible and about integrating AspectJ
 technology with other technologies.
 
 For both mailing lists, only subscribed members may post messages. To
-subscribe, visit the http://eclipse.org/aspectj[AspectJ web site].
+subscribe, visit the https://eclipse.org/aspectj[AspectJ web site].
 
 There you can also subscribe to `aspectj-announce@eclipse.org`, a
 low-traffic list containing only announcements about significant AspectJ
@@ -1248,7 +1248,7 @@ with existing Java development tools?]
 
 *A:* The AspectJ team directly provided components for JBuilder, Forte,
 and Emacs and supported the open-source AspectJ plugin project at
-http://eclipse.org/ajdt which uses the AJDE API support for IDE's.
+https://eclipse.org/ajdt which uses the AJDE API support for IDE's.
 Supporting new IDE's is a matter of building on the AJDE API's, mostly
 likely adopting one of the existing open-source IDE extensions as a
 design template. Here are the IDE's where we know people have expressed
@@ -1269,7 +1269,7 @@ integrations, contact those projects.
 
 *A:* Yes. The core AJDE API is extensible and the source code is
 available for download. Start by studying the sources for the existing
-IDE support linked off the AspectJ site http://eclipse.org/aspectj.
+IDE support linked off the AspectJ site https://eclipse.org/aspectj.
 
 *Q:* I want the aspects for development builds but remove them for
 production builds. How can I set up the build system so they are
@@ -1839,7 +1839,7 @@ for using AspectJ with other programming tools.
 . There is a community repository of sample code and tutorials in the
 AspectJ CVS tree `docs` module `sandbox` directory. These are extracted
 and published (online only)
-http://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/sample-code.html[here]
+https://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/sample-code.html[here]
 .
 . The `teaching` directory of the `docs` module contains public
 materials the AspectJ committers use for presentations, some of which
@@ -2452,7 +2452,7 @@ aspect A {
 
 *A:* The bugs affecting the semantics of the language are marked with
 the "info" keyword. Find them with the query
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info
 
 *Q:* What extra memory is required at runtime?
 
@@ -2718,7 +2718,7 @@ used in AspectJ-1.1 if we can find the time. Erik Hilsdale and Jim
 Hugunin did draft a paper for AOSD 2004, now available on Jim's web
 site: http://hugunin.net/papers.html Jim summarized advice weaving in
 the AspectJ 1.1 implementation in the
-http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00519.html[following
+https://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00519.html[following
 mailing-list reply]:
 
 Each piece of advice in an aspect is associated with a pointcut. This
@@ -2866,7 +2866,7 @@ another bug or actually cover many bugs.
 Find them by searching open compiler bugs and picking out any which do
 not have test case attachments or a comment that a test case has been
 written. Here is a query for open compiler bugs:
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED
 +
 For how to write test cases, see #q:harnesstestcases[Q:How should I
 submit test cases for bugs?].
@@ -2894,11 +2894,11 @@ the 1.0 downloads. It contains instructions for building from sources.
 AspectJ 1.1+ source code is available through CVS using the CVS Root
 `dev.eclipse.org:/cvsroot/technology`. For more information on accessing
 the CVS tree at eclipse.org, see the documentation from
-http://eclipse.org. Find specific instructions in the AspectJ tree at
-http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/readme-build-and-test-aspectj.html?rev=HEAD&content-type=text/html&cvsroot=Technology_Project[org.aspectj/modules/build/readme-build-and-test-aspectj.html].
+https://eclipse.org. Find specific instructions in the AspectJ tree at
+https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/readme-build-and-test-aspectj.html?rev=HEAD&content-type=text/html&cvsroot=Technology_Project[org.aspectj/modules/build/readme-build-and-test-aspectj.html].
 If you would like to use Ant to checkout the sources, build the
 distribution, and test everything, see
-http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/release/build.xml?rev=HEAD&content-type=text/xml&cvsroot=Technology_Project[org.aspectj/modules/build/release/build.xml].
+https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/release/build.xml?rev=HEAD&content-type=text/xml&cvsroot=Technology_Project[org.aspectj/modules/build/release/build.xml].
 
 To check out the source code in Eclipse go to
 (`File > new > Other > CVS > Checkout Projects from CVS`). You'll need
@@ -2927,7 +2927,7 @@ go to `File > Switch Workspace`.
 
 The `org.aspectj.lib` project is an AspectJ project so you also have to
 have AJDT installed. For the latest AJDT release and download
-instructions visit the http://www.eclipse.org/ajdt/downloads/[AJDT
+instructions visit the https://www.eclipse.org/ajdt/downloads/[AJDT
 Downloads] page.
 
 When you've added the variables click OK to do a full rebuild, then run
@@ -2989,7 +2989,7 @@ versions.
 `your_eclipse_installation_directory/aspectj_development_workspace/aj-build`.
 
 To import a locally built AspectJ into AJDT first follow the
-instructions on http://www.eclipse.org/ajdt/faq.php#q:develop[How do I
+instructions on https://www.eclipse.org/ajdt/faq.php#q:develop[How do I
 setup an AJDT development environment in Eclipse?] for setting up an
 AJDT development environment and running the correctness tests. Then:
 
@@ -3179,12 +3179,12 @@ not hold BCEL structures in memory after our evaluation completes.
 
 *Q:* How do I find out more about AspectJ?
 
-*A:* Visit the AspectJ project web site: http://eclipse.org/aspectj.
+*A:* Visit the AspectJ project web site: https://eclipse.org/aspectj.
 
 *Q:* How do I submit a bug report?
 
 *A:* You can submit a bug from
-http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ . If it seems
+https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ . If it seems
 to be a bug in the compiler, please attach a small test case (source
 code) to reproduce the problem. For more information on writing compiler
 test cases, see #q:ajcbugs[Q:How do I write bugs for the AspectJ
@@ -3196,15 +3196,15 @@ link:pdguide/index.html[AspectJ Problem Diagnosis Guide].
 
 *A:* You can reach other AspectJ users by using the aspectj-users
 mailing list. You can subscribe to the list or view the list archives
-from the AspectJ home page http://eclipse.org/aspectj .
+from the AspectJ home page https://eclipse.org/aspectj .
 
 *Q:* How can I search the email archives or the web site?
 
 *A:* It is very effective to do a google search of the form,
 http://www.google.com/search?q=site:eclipse.org+cflowbelow , and you can
-use the eclipse.org search at http://www.eclipse.org/search/search.cgi .
+use the eclipse.org search at https://www.eclipse.org/search/search.cgi .
 You can also check the old archives available for download from the
-AspectJ home page http://eclipse.org/aspectj .
+AspectJ home page https://eclipse.org/aspectj .
 
 *Q:* How should I write email queries?
 
@@ -3242,12 +3242,12 @@ Bug report for the IDE extensions go to their respective projects,
 listed in #q:integrateWithDevTools[Q: How well does AspectJ integrate
 with existing Java development tools?] (including bug reports for the
 AJDE Eclipse support, which you can submit at
-http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT ).
+https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT ).
 
 Bug reports on ajbrowser should have version information for both Java
 and AspectJ, and (most importantly) clear steps for reproducing the bug.
 You may submit ajbrowser bugs against the IDE component of AspectJ via
-the web form http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ.
+the web form https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ.
 
 One of the benefits of open-source is that you can find and fix the bug
 for yourself; when you submit the fix back to us, we can validate the
@@ -3270,7 +3270,7 @@ one or more source files.
 sure to specify the expected output/behavior (e.g., compiler error on
 line 32) and, if the compile should complete, the main class to run.
 . Submit the bugs via the web form
-http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ .
+https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ .
 . Attach the test case to the bug. The test case may be a single file or
 it may be multiple files in a single zip archive, of the form discussed
 in #q:harnesstestcases[Q:How should I submit test cases for bugs?].
@@ -3433,7 +3433,7 @@ More details for 1.0 and earlier releases are available in changes.html.
 *A:* Below is a table describing the goals for the major releases. For
 information about specific features, search the bug database for ``RFE``'s
 ("requests for enhancement") by
-http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&bug_severity=enhancement[selecting
+https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&bug_severity=enhancement[selecting
 severity of "enhancement"]. Like many open-source projects, we don't
 make or promise schedules, but we do follow a pattern of issuing preview
 releases which can give observers an idea of when a particular release
diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml
index 855859b64..b367c1bf2 100644
--- a/docs/faq/faq.xml
+++ b/docs/faq/faq.xml
@@ -167,10 +167,10 @@
             <ulink url="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt">Eclipse Public License v 2.0</ulink>.
           </para>
           <para>AspectJ 1.5.2 through 1.9.6 source code and documentation is available under the
-            <ulink url="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License v 1.0</ulink>.
+            <ulink url="https://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License v 1.0</ulink>.
           </para>
           <para>AspectJ 1.1 through 1.5.1 source code and documentation is available under the
-            <ulink url="http://eclipse.org/legal/cpl-v10.html">Common Public License 1.0</ulink>.
+            <ulink url="https://eclipse.org/legal/cpl-v10.html">Common Public License 1.0</ulink>.
           </para>
           <para>The AspectJ 1.0 tools are open-source software available under the
             <ulink url="http://www.opensource.org/licenses/mozilla1.1">Mozilla Public License 1.1</ulink>.
@@ -182,7 +182,7 @@
           <ulink url="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt">Eclipse Public License</ulink>.
           </para>
           <para>For answers to common licensing questions, see the
-          <ulink url="http://www.eclipse.org/legal/eplfaq.php">Eclipse Public License FAQ</ulink>.
+          <ulink url="https://www.eclipse.org/legal/eplfaq.php">Eclipse Public License FAQ</ulink>.
           </para>
           <para>
           </para>
@@ -203,8 +203,8 @@
           <para>It has evolved through open-source releases
           to a strong user community and now operates as an
           open source project at
-           <ulink url="http://eclipse.org/aspectj">
-                       http://eclipse.org/aspectj</ulink>
+           <ulink url="https://eclipse.org/aspectj">
+                       https://eclipse.org/aspectj</ulink>
             The AspectJ team works closely with the community
             to ensure AspectJ continues to evolve as an effective
             aspect-oriented programming language and tool set.
@@ -212,7 +212,7 @@
           <para>
             The latest release is 1.2 <!-- XXX todo Update me! -->
 	        which can be downloaded from the
-             <ulink url="http://eclipse.org/aspectj">AspectJ project page</ulink>,
+             <ulink url="https://eclipse.org/aspectj">AspectJ project page</ulink>,
              including sources as described
              <xref linkend="q:buildingsource"/>.
              Development is focused on supporting applications,
@@ -251,7 +251,7 @@
         </question>
         <answer>
           <para>From AspectJ's
-            <ulink url="http://eclipse.org/aspectj">web page
+            <ulink url="https://eclipse.org/aspectj">web page
             </ulink>, download the AspectJ distribution.
             The <literal>jar</literal> file is installed by executing
           </para>
@@ -394,8 +394,8 @@ java -jar <emphasis>jar file name</emphasis>
             <listitem>
               <para>Eclipse (version 2.0)
                    in the Eclipse AspectJ Development Tools project
-                    <ulink url="http://eclipse.org/ajdt">
-                                http://eclipse.org/ajdt
+                    <ulink url="https://eclipse.org/ajdt">
+                                https://eclipse.org/ajdt
                     </ulink>
               </para>
             </listitem>
@@ -909,7 +909,7 @@ aspect.
           For AspectJ examples of configurable or reflection-dependent programs,
           see the sample code linked off the AspectJ documentation page
           or the examples discussed on the mailing list, e.g.,
-          <ulink url="http://dev.eclipse.org/mhonarc/lists/aspectj-users/msg02151.html">
+          <ulink url="https://dev.eclipse.org/mhonarc/lists/aspectj-users/msg02151.html">
 			Incremental and runtime weaving support?</ulink>.
           </para>
         </answer>
@@ -1546,13 +1546,13 @@ aspect PublicErrorLogging {
           <ulink url="progguide/implementation.html">
           AspectJ Programming Guide Appendix, "Implementation Notes"</ulink>
           and the AspectJ bugs in the database at
-          <ulink url="http://bugs.eclipse.org/bugs">http://bugs.eclipse.org/bugs</ulink>
+          <ulink url="https://bugs.eclipse.org/bugs">https://bugs.eclipse.org/bugs</ulink>
           (using the product <literal>AspectJ</literal>).  Here are direct links to
-              <ulink url="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
+              <ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
                view open compiler bugs</ulink>,
-              <ulink url="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ">
+              <ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ">
                view all Aspectj bugs (open or closed)</ulink>, or
-              <ulink url="http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ">
+              <ulink url="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ">
                add new bugs</ulink>.
           </para>
         </answer>
@@ -1586,7 +1586,7 @@ aspect PublicErrorLogging {
           <para>
             For both mailing lists, only subscribed members may post messages.
             To subscribe, visit the
-            <ulink url="http://eclipse.org/aspectj">AspectJ web site</ulink>.
+            <ulink url="https://eclipse.org/aspectj">AspectJ web site</ulink>.
           </para>
           <para>
             There you can also subscribe to
@@ -2084,7 +2084,7 @@ declare warning: get(* Foo.*) &amp;&amp; within(Bar)
           <para>
             The AspectJ team directly provided components for JBuilder, Forte,
             and Emacs and supported the open-source AspectJ plugin project
-            at <ulink url="http://eclipse.org/ajdt">http://eclipse.org/ajdt</ulink>
+            at <ulink url="https://eclipse.org/ajdt">https://eclipse.org/ajdt</ulink>
             which uses the AJDE API support for IDE's.
             Supporting new IDE's is a matter of building on the AJDE API's,
             mostly likely adopting one of the existing open-source IDE
@@ -2133,7 +2133,7 @@ declare warning: get(* Foo.*) &amp;&amp; within(Bar)
           <para>Yes. The core AJDE API is extensible and the source code is
             available for download. Start by studying the sources
             for the existing IDE support linked off the AspectJ site
-            <ulink url="http://eclipse.org/aspectj">http://eclipse.org/aspectj</ulink>.
+            <ulink url="https://eclipse.org/aspectj">https://eclipse.org/aspectj</ulink>.
           </para>
         </answer>
       </qandaentry>
@@ -2851,7 +2851,7 @@ aspect MyMarker extends MarkerExample {
            in the AspectJ CVS tree
            <literal>docs</literal> module <literal>sandbox</literal> directory.
            These are extracted and published (online only)
-           <ulink url="http://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/sample-code.html">
+           <ulink url="https://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/sample-code.html">
 		   here
            </ulink>.
 			</para></listitem>
@@ -3766,8 +3766,8 @@ aspect A {
 		  <para>The bugs affecting the semantics of the language
 			  are marked with the "info" keyword.  Find them with
 			  the query
-			  <ulink url="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;keywords=info">
-						  http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;keywords=info
+			  <ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;keywords=info">
+						  https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;keywords=info
 						  </ulink>
 		  </para>
         </answer>
@@ -4176,7 +4176,7 @@ java -javaagent:aspectjweaver.jar -classpath "aspects.jar:${CLASSPATH}" ..
           <ulink url="http://hugunin.net/papers.html">
           	http://hugunin.net/papers.html</ulink>
           Jim summarized advice weaving in the AspectJ 1.1 implementation in the
-          <ulink url="http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00519.html">
+          <ulink url="https://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg00519.html">
           	following mailing-list reply</ulink>:
           </para>
           <para>
@@ -4397,8 +4397,8 @@ java -javaagent:aspectjweaver.jar -classpath "aspects.jar:${CLASSPATH}" ..
               a test case has been written.
               Here is a query for open compiler bugs:
               <!-- ulink gacks on ampersands in url value, so quote them -->
-              <ulink url="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
-              http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED
+              <ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">
+              https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;component=Compiler&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED
               </ulink>
               </para>
               <para>For how to write test cases, see
@@ -4448,13 +4448,13 @@ java -javaagent:aspectjweaver.jar -classpath "aspects.jar:${CLASSPATH}" ..
 				CVS Root <literal>dev.eclipse.org:/cvsroot/technology</literal>.
 				For more information on accessing the CVS tree at eclipse.org,
 				see the documentation from <ulink
-				url="http://eclipse.org">http://eclipse.org</ulink>. Find
+				url="https://eclipse.org">https://eclipse.org</ulink>. Find
 				specific instructions in the AspectJ tree at <ulink
-				url="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/readme-build-and-test-aspectj.html?rev=HEAD&amp;content-type=text/html&amp;cvsroot=Technology_Project">
+				url="https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/readme-build-and-test-aspectj.html?rev=HEAD&amp;content-type=text/html&amp;cvsroot=Technology_Project">
 				org.aspectj/modules/build/readme-build-and-test-aspectj.html</ulink>.
 				If you would like to use Ant to checkout the sources, build the
 				distribution, and test everything, see <ulink
-				url="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/release/build.xml?rev=HEAD&amp;content-type=text/xml&amp;cvsroot=Technology_Project">
+				url="https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/release/build.xml?rev=HEAD&amp;content-type=text/xml&amp;cvsroot=Technology_Project">
 				org.aspectj/modules/build/release/build.xml</ulink>. </para>
           <para>
           To check out the source code in Eclipse go to (<literal>File > new > Other > CVS > Checkout Projects from CVS</literal>). You'll need about 125 MB of space for the source and build.
@@ -4499,7 +4499,7 @@ java -javaagent:aspectjweaver.jar -classpath "aspects.jar:${CLASSPATH}" ..
 		  The <literal>org.aspectj.lib</literal> project is an AspectJ project so
           you also have to have AJDT installed. For the latest AJDT release and
           download instructions visit the
-		  <ulink url="http://www.eclipse.org/ajdt/downloads/">AJDT Downloads</ulink> page.
+		  <ulink url="https://www.eclipse.org/ajdt/downloads/">AJDT Downloads</ulink> page.
 		  </para>
 			<para>
 			When you've added the variables click OK to do a full rebuild, then run the tests by going in the Package Explorer to:
@@ -4602,7 +4602,7 @@ java -javaagent:aspectjweaver.jar -classpath "aspects.jar:${CLASSPATH}" ..
 		  </para>
 			<para>
 			To import a locally built AspectJ into AJDT first follow the
-			instructions on <ulink url="http://www.eclipse.org/ajdt/faq.php#q:develop">
+			instructions on <ulink url="https://www.eclipse.org/ajdt/faq.php#q:develop">
 			How do I setup an AJDT development environment in Eclipse?</ulink>
 			for setting up an AJDT development environment and running the
 			correctness tests. Then:
@@ -4885,7 +4885,7 @@ cd build
         </question>
         <answer>
           <para>Visit the AspectJ project web site:
-            <ulink url="http://eclipse.org/aspectj">http://eclipse.org/aspectj</ulink>.
+            <ulink url="https://eclipse.org/aspectj">https://eclipse.org/aspectj</ulink>.
           </para>
         </answer>
       </qandaentry>
@@ -4896,8 +4896,8 @@ cd build
         </question>
         <answer>
           <para>You can submit a bug from
-              <ulink url="http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ">
-                          http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ
+              <ulink url="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ">
+                          https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ
               </ulink>.
             If it seems to be a bug in the compiler,
             please attach a small test case (source code)
@@ -4921,8 +4921,8 @@ cd build
           <para>You can reach other AspectJ users by using the
             aspectj-users mailing list.  You can subscribe to the list or view the
             list archives from the AspectJ home page
-            <ulink url="http://eclipse.org/aspectj">
-              http://eclipse.org/aspectj
+            <ulink url="https://eclipse.org/aspectj">
+              https://eclipse.org/aspectj
             </ulink>.
           </para>
         </answer>
@@ -4941,13 +4941,13 @@ cd build
               http://www.google.com/search?q=site:eclipse.org+cflowbelow
             </ulink>,
     		and you can use the eclipse.org search at
-            <ulink url="http://www.eclipse.org/search/search.cgi">
-              http://www.eclipse.org/search/search.cgi
+            <ulink url="https://www.eclipse.org/search/search.cgi">
+              https://www.eclipse.org/search/search.cgi
             </ulink>.
 		    You can also check the old archives available for download from
     		the AspectJ home page
-    		<ulink url="http://eclipse.org/aspectj">
-              http://eclipse.org/aspectj
+    		<ulink url="https://eclipse.org/aspectj">
+              https://eclipse.org/aspectj
             </ulink>.
           </para>
         </answer>
@@ -5028,8 +5028,8 @@ cd build
              <xref linkend="q:integrateWithDevTools"/>
           (including bug reports for the AJDE Eclipse support,
           which you can submit at
-            <ulink url="http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT">
-                        http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT
+            <ulink url="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT">
+                        https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT
             </ulink>).
           </para>
           <para>
@@ -5076,8 +5076,8 @@ cd build
               <listitem>
                 <para>
 	Submit the bugs via the web form
-            <ulink url="http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ">
-                        http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ
+            <ulink url="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ">
+                        https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ
             </ulink>.
                 </para>
               </listitem>
@@ -5376,7 +5376,7 @@ cd build
             Below is a table describing the goals for the major releases.
             For information about specific features, search the bug database
             for <literal>RFE</literal>'s ("requests for enhancement") by
-            <ulink url="http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;bug_severity=enhancement">
+            <ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&amp;bug_severity=enhancement">
             	selecting severity of "enhancement"</ulink>.
 
             Like many open-source projects, we don't make or promise
diff --git a/docs/progGuideDB/examples.xml b/docs/progGuideDB/examples.xml
index 12fbe8ef2..05645ab04 100644
--- a/docs/progGuideDB/examples.xml
+++ b/docs/progGuideDB/examples.xml
@@ -37,7 +37,7 @@
     <para>
       The examples source code is part of the AspectJ distribution which may be
       downloaded from the AspectJ project page ( <ulink
-      url="http://eclipse.org/aspectj" /> ).
+      url="https://eclipse.org/aspectj" /> ).
     </para>
 
     <para>
@@ -2441,4 +2441,3 @@ s1.toString(): Square side = 1.0 @ (1.0, 2.0)
     </sect2>
   </sect1>
 </chapter>
-
diff --git a/docs/progGuideDB/gettingstarted.adoc b/docs/progGuideDB/gettingstarted.adoc
index c4bb4eb25..ca05f782b 100644
--- a/docs/progGuideDB/gettingstarted.adoc
+++ b/docs/progGuideDB/gettingstarted.adoc
@@ -784,7 +784,7 @@ exactly which figure elements moved, the change would be entirely local
 to the aspect. The pointcut would be updated to expose the object being
 moved, and the advice would be updated to record that object. The paper
 An Overview of AspectJ (available linked off of the AspectJ web site --
-http://eclipse.org/aspectj[]), presented at ECOOP 2001, presents a
+https://eclipse.org/aspectj[]), presented at ECOOP 2001, presents a
 detailed discussion of various ways this aspect could be expected to
 evolve.
 
diff --git a/docs/progGuideDB/gettingstarted.xml b/docs/progGuideDB/gettingstarted.xml
index d21326c32..6429d017f 100644
--- a/docs/progGuideDB/gettingstarted.xml
+++ b/docs/progGuideDB/gettingstarted.xml
@@ -47,7 +47,7 @@
       doing so.  Readers who would like to understand the examples in more
       detail, or who want to learn how to program examples like these, can
       find more complete examples and supporting material linked from the
-      AspectJ web site ( <ulink url="http://eclipse.org/aspectj" /> ).
+      AspectJ web site ( <ulink url="https://eclipse.org/aspectj" /> ).
     </para>
 
     <para>
@@ -1069,7 +1069,7 @@ aspect MoveTracking {
         advice would be updated to record that object. The paper
         <citetitle>An Overview of AspectJ</citetitle> (available linked off
         of the AspectJ web site -- <ulink
-        url="http://eclipse.org/aspectj" />), presented at ECOOP
+        url="https://eclipse.org/aspectj" />), presented at ECOOP
         2001, presents a detailed discussion of various ways this aspect
         could be expected to evolve.
       </para>
@@ -1308,4 +1308,3 @@ aspect ContextFilling {
     </para>
   </sect1>
 </chapter>
-
diff --git a/docs/sandbox/common/caching/WatchSetters.java b/docs/sandbox/common/caching/WatchSetters.java
index fa280f58f..4546977fe 100644
--- a/docs/sandbox/common/caching/WatchSetters.java
+++ b/docs/sandbox/common/caching/WatchSetters.java
@@ -20,15 +20,15 @@ import java.lang.reflect.Method;
  * ...
  * if (!foo.isDirtyValid() || foo.isDirty()) {
  *    foo.write();
- * } 
+ * }
  * </pre>
- * 
+ *
  * (Initial draft was sent to aspectj-users@eclipse.org by
- * Ricardo on 5/13/2003 
- * (http://dev.eclipse.org/mhonarc/lists/aspectj-users/msg00482.html)
+ * Ricardo on 5/13/2003
+ * (https://dev.eclipse.org/mhonarc/lists/aspectj-users/msg00482.html)
  * but his email fails now, so we
  * did not get explicit authorization to post.)
- * 
+ *
  * @author Ricardo Giacomin, Wes Isberg
  */
 public aspect WatchSetters {
@@ -59,7 +59,7 @@ public aspect WatchSetters {
     public boolean IWatched.isDirtyValid() {
         return dirtyValid;
     }
-    
+
     /** Setters are instance methods returning void,
      * prefixed "set..." and taking exactly 1 argument.
      * Does not use args(id), since that requires the
@@ -75,7 +75,7 @@ public aspect WatchSetters {
      * there wasn't a corresponding setter, we didn't
      * have the right security permissions, etc.
      */
-    void around(IWatched watched) : setters(watched) 
+    void around(IWatched watched) : setters(watched)
             && if(watched.dirtyValid) {
         // get value by invoking getter method
         Object value = NONE;
@@ -86,7 +86,7 @@ public aspect WatchSetters {
                 .getMethod(getterName, GETTER_ARG_TYPES);
             value = method.invoke(watched, GETTER_ARGS);
         } catch (Throwable t) {
-            // NoSuchMethodException, SecurityException, 
+            // NoSuchMethodException, SecurityException,
             // InvocationTargetException...
         }
         if (NONE == value) {
@@ -110,17 +110,17 @@ class Timer implements WatchSetters.IWatched {
     private static int ID;
     public final int id = ++ID;
     private int counter;
-    public int getCounter() { 
+    public int getCounter() {
         return counter;
     }
-    public void setCounter(int i) { 
+    public void setCounter(int i) {
         counter = i;
     }
     public void write() {
         System.out.println("writing " + this);
     }
     public String toString() {
-        return "Timer " + id + "==" + counter;  
+        return "Timer " + id + "==" + counter;
     }
 }
 
@@ -137,14 +137,14 @@ class Client {
        }
    }
 }
- 
+
 // ---- aspects use dirty to implement cache, etc.
 // Volatile things are flushed when dirty
 abstract aspect Volatile {
     // subaspects declare targets using Volatile.ITag
     protected interface ITag {}
     declare precedence : Volatile+, WatchSetters;
-    after(WatchSetters.IWatched watched) returning : 
+    after(WatchSetters.IWatched watched) returning :
             WatchSetters.setters(watched) {
         if (!watched.isDirtyValid() || watched.isDirty()) {
             flushCache(watched);
@@ -169,18 +169,18 @@ aspect Testing {
     void signal(String s) {
         org.aspectj.testing.Tester.event(s);
     }
-    
+
     static {
         org.aspectj.testing.Tester.expectEvent("client-write");
         org.aspectj.testing.Tester.expectEvent("volatile-write");
     }
 
-    before() : withincode(void VolatileTimer.flushCache(Object)) 
+    before() : withincode(void VolatileTimer.flushCache(Object))
         && call(void Timer.write()) {
         signal("volatile-write");
     }
 
-    before() : withincode(void Client.handleTimer(Timer)) 
+    before() : withincode(void Client.handleTimer(Timer))
         && call(void Timer.write()) {
         signal("client-write");
     }
@@ -188,4 +188,4 @@ aspect Testing {
     after() returning : execution(void WatchSetters.main(String[])) {
         org.aspectj.testing.Tester.checkAllEvents();
     }
-}
\ No newline at end of file
+}
diff --git a/docs/sandbox/inoculated/readme.txt b/docs/sandbox/inoculated/readme.txt
index 04f05e65a..90ced047b 100644
--- a/docs/sandbox/inoculated/readme.txt
+++ b/docs/sandbox/inoculated/readme.txt
@@ -1,10 +1,10 @@
 
 This contains demonstration source code for the article
 "Get Inoculated!" in the May 2002 issue of Software Development
-magazine.  
+magazine.
 
 To use it you will need the AspectJ tools available from
-http://eclipse.org/aspectj.  We also recommend you download the
+https://eclipse.org/aspectj.  We also recommend you download the
 documentation bundle and support for the IDE of your choice.
 
 Each file has a snippet for a section of the article.  To find
@@ -28,7 +28,7 @@ Compile and run as usual:
    > ajc -classpath "$AJ_HOME/lib/aspectjrt.jar" {file}
    > java -classpath ".;$AJ_HOME/lib/aspectjrt.jar" {class}
 
-For email discussions and support, see http://eclipse.org/aspectj.
+For email discussions and support, see https://eclipse.org/aspectj.
 
 
 Enjoy!
diff --git a/docs/sandbox/trails/links.adoc b/docs/sandbox/trails/links.adoc
index 2dd9d6945..0db3e202d 100644
--- a/docs/sandbox/trails/links.adoc
+++ b/docs/sandbox/trails/links.adoc
@@ -8,7 +8,7 @@ arguably it should.
 
 For a list of publications about AspectJ that might contain sample code,
 see the publications link off the AspectJ web site at
-http://eclipse.org/aspectj
+https://eclipse.org/aspectj
 
 *"AspectJ in Action"* by Ramnivas Laddad has sample code including
 four patterns: the worker object creation pattern, the exception
diff --git a/docs/sandbox/trails/myeclipseide.adoc b/docs/sandbox/trails/myeclipseide.adoc
index b2eee0321..de64c7e60 100644
--- a/docs/sandbox/trails/myeclipseide.adoc
+++ b/docs/sandbox/trails/myeclipseide.adoc
@@ -4,12 +4,12 @@ _Last updated: 2003-07-08 by wisberg_
 
 MyEclipseIde (http://www.myeclipseide.com/[http://www.myeclipseide.com])
 aims to make it easy to develop J2EE applications using Eclipse. AJDT
-(http://eclipse.org/ajdt) is an Eclipse plug-in that supports AspectJ.
+(https://eclipse.org/ajdt) is an Eclipse plug-in that supports AspectJ.
 
 == Getting started
 
 * To install AJDT with MyEclipseIDE, direct the Eclipse update manager
-to http://download.eclipse.org/technology/ajdt/dev/update, install the
+to https://download.eclipse.org/technology/ajdt/dev/update, install the
 plug-in, and follow any post-install instructions.
 * To enable a project to use aspects, first select
 `Convert to AspectJ project` from the project's context menu (select
diff --git a/docs/teaching/exercises/index.html b/docs/teaching/exercises/index.html
index a23899c8d..85be67805 100644
--- a/docs/teaching/exercises/index.html
+++ b/docs/teaching/exercises/index.html
@@ -679,7 +679,7 @@ crosscutting modularity. </p>
 an active user community for AspectJ at</p>
 
   <blockquote>
-  http://www.eclipse.org/aspectj
+  https://www.eclipse.org/aspectj
   </blockquote>
 
 </div>
diff --git a/docs/teaching/exercises/plugins/index.adoc b/docs/teaching/exercises/plugins/index.adoc
index 9fc0b8a80..1cdf0fbc1 100644
--- a/docs/teaching/exercises/plugins/index.adoc
+++ b/docs/teaching/exercises/plugins/index.adoc
@@ -5,15 +5,15 @@ directory:
 
 [cols=",",]
 |===
-|For Eclipse 3.0 with AJDT 1.1.12       
-|http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.1.12.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.1.12.zip]
+|For Eclipse 3.0 with AJDT 1.1.12
+|https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.1.12.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.1.12.zip]
 
-|For Eclipse 3.0 with AJDT 1.2.0M2       
-|http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0M2.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.2.0M2.zip]
+|For Eclipse 3.0 with AJDT 1.2.0M2
+|https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0M2.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.2.0M2.zip]
 
-|For Eclipse 3.0 with AJDT 1.2.0 latest dev build       
-|http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_301_Dev.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.2.0_301_Dev.zip]
+|For Eclipse 3.0 with AJDT 1.2.0 latest dev build
+|https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_301_Dev.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.2.0_301_Dev.zip]
 
-|For Eclipse 3.1M5 with AJDT 1.2.0 latest dev build       
-|http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_31M5_Dev.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.2.0_31M5_Dev.zip]
+|For Eclipse 3.1M5 with AJDT 1.2.0 latest dev build
+|https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_31M5_Dev.zip?rev=1.1&cvsroot=Technology_Project[org.aspectj.tutorial.exercises_1.2.0_31M5_Dev.zip]
 |===
diff --git a/docs/teaching/exercises/plugins/index.html b/docs/teaching/exercises/plugins/index.html
index 297c8121a..ef87c84c8 100644
--- a/docs/teaching/exercises/plugins/index.html
+++ b/docs/teaching/exercises/plugins/index.html
@@ -8,22 +8,22 @@
 <table>
 <tr>
 <td>For Eclipse 3.0 with AJDT 1.1.12&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td><a href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.1.12.zip?rev=1.1&cvsroot=Technology_Project">
+<td><a href="https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.1.12.zip?rev=1.1&cvsroot=Technology_Project">
 org.aspectj.tutorial.exercises_1.1.12.zip</a></td>
 </tr>
 <tr>
 <td>For Eclipse 3.0 with AJDT 1.2.0M2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td><a href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0M2.zip?rev=1.1&cvsroot=Technology_Project">
+<td><a href="https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0M2.zip?rev=1.1&cvsroot=Technology_Project">
 org.aspectj.tutorial.exercises_1.2.0M2.zip</a></td>
 </tr>
 <tr>
 <td>For Eclipse 3.0 with AJDT 1.2.0 latest dev build&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td><a href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_301_Dev.zip?rev=1.1&cvsroot=Technology_Project">
+<td><a href="https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_301_Dev.zip?rev=1.1&cvsroot=Technology_Project">
 org.aspectj.tutorial.exercises_1.2.0_301_Dev.zip</a></td>
 </tr>
 <tr>
 <td>For Eclipse 3.1M5 with AJDT 1.2.0 latest dev build&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td><a href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_31M5_Dev.zip?rev=1.1&cvsroot=Technology_Project">
+<td><a href="https://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/docs/teaching/exercises/plugins/org.aspectj.tutorial.exercises_1.2.0_31M5_Dev.zip?rev=1.1&cvsroot=Technology_Project">
 org.aspectj.tutorial.exercises_1.2.0_31M5_Dev.zip</a></td>
 </tr>
 </table>
diff --git a/loadtime/src/test/resources/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml b/loadtime/src/test/resources/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml
index 252bc0136..6757c7c64 100644
--- a/loadtime/src/test/resources/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml
+++ b/loadtime/src/test/resources/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://sswww.aspectj.org/dtd/aspectj_1_5_0.dtd">
+<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "https://www.aspectj.org/dtd/aspectj_1_5_0.dtd">
 <aspectj>
     <weaver options="-showWeaveInfo">
         <include within="foo..bar.Goo+"/>
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
index bc4904bd7..64953418a 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
@@ -1040,7 +1040,7 @@ public class AjASTConverter extends ASTConverter {
 		int typeEnd = type.getStartPosition() + type.getLength() - 1;
 		int rightEnd = Math.max(typeEnd, argument.declarationSourceEnd);
 		/*
-		 * There is extra work to do to set the proper type positions See PR http://bugs.eclipse.org/bugs/show_bug.cgi?id=23284
+		 * There is extra work to do to set the proper type positions See PR https://bugs.eclipse.org/bugs/show_bug.cgi?id=23284
 		 */
 		if (isVarArgs) {
 			setTypeForSingleVariableDeclaration(variableDecl, type, extraDimensions + 1);
@@ -2706,7 +2706,7 @@ public class AjASTConverter extends ASTConverter {
 		int typeEnd = type.getStartPosition() + type.getLength() - 1;
 		int rightEnd = Math.max(typeEnd, localDeclaration.declarationSourceEnd);
 		/*
-		 * There is extra work to do to set the proper type positions See PR http://bugs.eclipse.org/bugs/show_bug.cgi?id=23284
+		 * There is extra work to do to set the proper type positions See PR https://bugs.eclipse.org/bugs/show_bug.cgi?id=23284
 		 */
 		setTypeForSingleVariableDeclaration(variableDecl, type, extraDimensions);
 		variableDecl
@@ -2921,7 +2921,7 @@ public class AjASTConverter extends ASTConverter {
 				final SimpleName simpleName = new SimpleName(this.ast);
 				simpleName.internalSetIdentifier(new String(name));
 				// we need to search for the starting position of the first brace in order to set the proper length
-				// PR http://dev.eclipse.org/bugs/show_bug.cgi?id=10759
+				// PR https://dev.eclipse.org/bugs/show_bug.cgi?id=10759
 				int end = retrieveEndOfElementTypeNamePosition(sourceStart, sourceStart + length)[1];
 				if (end == -1) {
 					end = sourceStart + length - 1;
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
index 29ecacc89..ff8bfe68d 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
@@ -64,11 +64,11 @@ public class Main {
 	/** Header used when rendering exceptions for users */
 	public static final String THROWN_PREFIX = "Exception thrown from AspectJ " + Version.getText() + LangUtil.EOL + "" + LangUtil.EOL
 			+ "This might be logged as a bug already -- find current bugs at" + LangUtil.EOL
-			+ "  http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler" + LangUtil.EOL + "" + LangUtil.EOL
+			+ "  https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler" + LangUtil.EOL + "" + LangUtil.EOL
 			+ "Bugs for exceptions thrown have titles File:line from the top stack, " + LangUtil.EOL
 			+ "e.g., \"SomeFile.java:243\"" + LangUtil.EOL + "" + LangUtil.EOL
 			+ "If you don't find the exception below in a bug, please add a new bug" + LangUtil.EOL
-			+ "at http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ" + LangUtil.EOL
+			+ "at https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ" + LangUtil.EOL
 			+ "To make the bug a priority, please include a test program" + LangUtil.EOL + "that can reproduce this exception."
 			+ LangUtil.EOL;
 
@@ -77,7 +77,7 @@ public class Main {
 			+ "found in your AspectJ installation directory. The -Xmx parameter value" + LangUtil.EOL
 			+ "should be increased from 64M (default) to 128M or even 256M." + LangUtil.EOL + LangUtil.EOL
 			+ "See the AspectJ FAQ available from the documentation link" + LangUtil.EOL
-			+ "on the AspectJ home page at http://www.eclipse.org/aspectj";
+			+ "on the AspectJ home page at https://www.eclipse.org/aspectj";
 
 	private static final String MESSAGE_HOLDER_OPTION = "-messageHolder";
 
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
index 895108ade..33f0b53eb 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
@@ -325,7 +325,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern {
 			}
 			// if we got a "MAYBE" it's worth looking at the other signatures
 			// The first signature is the subject signature - and against it we must match modifiers/annotations/throws
-			// see http://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
+			// see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
 			subjectMatch = false;
 			// Early exit
 			if (wantsAnnotationMatch) {
@@ -346,7 +346,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern {
 		}
 
 		// Only the subject is checked for modifiers
-		// see http://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
+		// see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
 		if (subjectMatch && !modifiers.matches(aMember.getModifiers())) {
 			return FuzzyBoolean.NO;
 		}
@@ -366,7 +366,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern {
 		}
 
 		// Only the subject is checked for annotations (239441/119749)
-		// see http://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
+		// see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
 		if (subjectMatch) {
 			// The annotations must match if specified
 			if (!matchesAnnotations(aMember, inAWorld).alwaysTrue()) {
@@ -717,7 +717,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern {
 			return FuzzyBoolean.YES;
 		} else {
 			// do NOT look at ancestor members... only the subject can have an annotation match
-			// see http://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
+			// see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
 			return FuzzyBoolean.NO;
 		}
 	}
diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
index 54e1f017d..63fb81470 100644
--- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
+++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
@@ -88,7 +88,7 @@ public final class TestUtil {
 		{
 			URL url = null;
 			try {
-				url = new URL("http://eclipse.org/BADURL");
+				url = new URL("https://eclipse.org/BADURL");
 			} catch (MalformedURLException e) {
 				// ignore - hopefully never
 			}
diff --git a/tests/bugs/DeclareSoftDynamicPCDs.java b/tests/bugs/DeclareSoftDynamicPCDs.java
index 934afbc9e..07dba20dc 100644
--- a/tests/bugs/DeclareSoftDynamicPCDs.java
+++ b/tests/bugs/DeclareSoftDynamicPCDs.java
@@ -1,25 +1,25 @@
 /*
  * From:
- * 
- * http://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/doc/progguide/semantics-declare.html#d0e6499
  *
- * Pointcuts that appear inside of declare forms have certain restrictions. 
- * Like other pointcuts, these pick out join points, but they do so in a 
- * way that is statically determinable. 
- * 
- * Consequently, such pointcuts may not include, directly or indirectly 
- * (through user-defined pointcut declarations) pointcuts that discriminate 
- * based on dynamic (runtime) context. Therefore, such pointcuts may not be 
+ * https://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/doc/progguide/semantics-declare.html#d0e6499
+ *
+ * Pointcuts that appear inside of declare forms have certain restrictions.
+ * Like other pointcuts, these pick out join points, but they do so in a
+ * way that is statically determinable.
+ *
+ * Consequently, such pointcuts may not include, directly or indirectly
+ * (through user-defined pointcut declarations) pointcuts that discriminate
+ * based on dynamic (runtime) context. Therefore, such pointcuts may not be
  * defined in terms of
- * 
+ *
  * cflow
  * cflowbelow
  * this
  * target
  * args
  * if
- * 
- * all of which can discriminate on runtime information. 
+ *
+ * all of which can discriminate on runtime information.
  */
 
 public aspect DeclareSoftDynamicPCDs {
@@ -27,32 +27,32 @@ public aspect DeclareSoftDynamicPCDs {
 	declare soft : MyException:if(true) ;
 	pointcut p(): if(false);
 	declare soft : MyException: p() ;
-	
+
 	declare soft : MyException:cflow(execution(* main(..)));
 	pointcut p2(): cflow(execution(* main(..)));
 	declare soft : MyException:p2();
-	
+
 	declare soft : MyException:cflowbelow(execution(* main(..)));
 	pointcut p3(): cflowbelow(execution(* main(..)));
 	declare soft : MyException:p3();
-	
+
 	declare soft : MyException: this(Object);
 	pointcut p4(): this(Object);
 	declare soft : MyException:p4();
-	
+
 	declare soft : MyException:target(Object);
 	pointcut p5(): target(Object);
 	declare soft : MyException:p5();
-		
+
 	declare soft : MyException:args(Object);
 	pointcut p6(): args(Object);
 	declare soft : MyException:p6();
-	
+
 	class MyException extends Exception {
 	}
 
     public static void main(String[] args) {
 	    System.err.println("In main!");
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/tests/bugs/DecwClassCastException.java b/tests/bugs/DecwClassCastException.java
index e040a1e44..0ad3bd5cc 100644
--- a/tests/bugs/DecwClassCastException.java
+++ b/tests/bugs/DecwClassCastException.java
@@ -1,25 +1,25 @@
 /*
  * From:
- * 
- * http://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/doc/progguide/semantics-declare.html#d0e6499
  *
- * Pointcuts that appear inside of declare forms have certain restrictions. 
- * Like other pointcuts, these pick out join points, but they do so in a 
- * way that is statically determinable. 
- * 
- * Consequently, such pointcuts may not include, directly or indirectly 
- * (through user-defined pointcut declarations) pointcuts that discriminate 
- * based on dynamic (runtime) context. Therefore, such pointcuts may not be 
+ * https://dev.eclipse.org/viewcvs/indextech.cgi/~checkout~/aspectj-home/doc/progguide/semantics-declare.html#d0e6499
+ *
+ * Pointcuts that appear inside of declare forms have certain restrictions.
+ * Like other pointcuts, these pick out join points, but they do so in a
+ * way that is statically determinable.
+ *
+ * Consequently, such pointcuts may not include, directly or indirectly
+ * (through user-defined pointcut declarations) pointcuts that discriminate
+ * based on dynamic (runtime) context. Therefore, such pointcuts may not be
  * defined in terms of
- * 
+ *
  * cflow
  * cflowbelow
  * this
  * target
  * args
  * if
- * 
- * all of which can discriminate on runtime information. 
+ *
+ * all of which can discriminate on runtime information.
  */
 
 public aspect DecwClassCastException {
@@ -27,30 +27,30 @@ public aspect DecwClassCastException {
 	declare warning : if(true) : "if(true) directly against checker";
 	pointcut p(): if(false);
 	declare warning : p() : "if(false) through defined pointcut";
-	
+
 	declare error : cflow(execution(* main(..))): "cflow(execution(* main(..))) directly against checker";
 	pointcut p2(): cflow(execution(* main(..)));
 	declare error : p2() : "cflow(execution(* main(..))) through defined pointcut";
-	
+
 	declare warning : cflowbelow(execution(* main(..))): "cflowbelow(execution(* main(..))) directly against checker";
 	pointcut p3(): cflowbelow(execution(* main(..)));
 	declare error : p3() : "cflowbelow(execution(* main(..))) through defined pointcut";
-	
+
 	declare warning : this(Object): "this(Object) directly against checker";
 	pointcut p4(): this(Object);
 	declare warning : p4(): "this(Object) through defined pointcut";
-	
+
 	declare warning : target(Object): "target(Object) directly against checker";
 	pointcut p5(): target(Object);
 	declare warning : p5(): "target(Object) through defined pointcut";
-		
+
 	declare warning : args(Object): "args(Object) directly against checker";
 	pointcut p6(): args(Object);
 	declare warning : p6(): "args(Object) through defined pointcut";
-	
+
 
     public static void main(String[] args) {
 	    System.err.println("In main!");
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/tests/bugs/seven/lint/Main.java b/tests/bugs/seven/lint/Main.java
index 3bc98c382..4b7598beb 100644
--- a/tests/bugs/seven/lint/Main.java
+++ b/tests/bugs/seven/lint/Main.java
@@ -48,7 +48,7 @@ aspect XlintTest {
      * no example for "invalidWildcardTypeName"
      *
      * Never signalled anywhere in the codebase
-     * @see http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg01404.html
+     * @see https://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg01404.html
      */
 
 
@@ -74,7 +74,7 @@ aspect XlintTest {
      * no example for "shadowNotInStructure"
      *
      * Signalled if the structure model is broken, probably can't happen
-     * @see http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg01404.html
+     * @see https://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg01404.html
      */
 
 
diff --git a/tests/bugs1612/pr328099/aop.xml b/tests/bugs1612/pr328099/aop.xml
index b65c5ef91..e1aec86af 100755
--- a/tests/bugs1612/pr328099/aop.xml
+++ b/tests/bugs1612/pr328099/aop.xml
@@ -1,10 +1,10 @@
-<!DOCTYPE aspectj PUBLIC
-        "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
-<aspectj>
-  <weaver options="-debug">
-    <include within="foo.bar..*" />
-  </weaver>
-  <aspects>
-    <aspect name="foo.bar.BarAspect"/>
-  </aspects>
-</aspectj>
+<!DOCTYPE aspectj PUBLIC
+        "-//AspectJ//DTD//EN" "https://www.eclipse.org/aspectj/dtd/aspectj.dtd">
+<aspectj>
+  <weaver options="-debug">
+    <include within="foo.bar..*" />
+  </weaver>
+  <aspects>
+    <aspect name="foo.bar.BarAspect"/>
+  </aspects>
+</aspectj>
diff --git a/tests/bugs1612/pr328099/src/META-INF/aop.xml b/tests/bugs1612/pr328099/src/META-INF/aop.xml
index d08ae4126..76bd65ff3 100755
--- a/tests/bugs1612/pr328099/src/META-INF/aop.xml
+++ b/tests/bugs1612/pr328099/src/META-INF/aop.xml
@@ -1,10 +1,10 @@
-<!DOCTYPE aspectj PUBLIC
-        "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
-<aspectj>
-  <weaver>
-    <include within="foo.bar..*" />
-  </weaver>
-  <aspects>
-    <aspect name="foo.bar.BarAspect"/>
-  </aspects>
-</aspectj>
\ No newline at end of file
+<!DOCTYPE aspectj PUBLIC
+        "-//AspectJ//DTD//EN" "https://www.eclipse.org/aspectj/dtd/aspectj.dtd">
+<aspectj>
+  <weaver>
+    <include within="foo.bar..*" />
+  </weaver>
+  <aspects>
+    <aspect name="foo.bar.BarAspect"/>
+  </aspects>
+</aspectj>
diff --git a/tests/bugs164/pr265695/Asp.aj b/tests/bugs164/pr265695/Asp.aj
index 296cb1f36..50df2bbce 100644
--- a/tests/bugs164/pr265695/Asp.aj
+++ b/tests/bugs164/pr265695/Asp.aj
@@ -13,18 +13,18 @@ interface DemoService {
 
 
 class DemoServiceImpl implements DemoService {
-    public void secureMethod() {    }    
+    public void secureMethod() {    }
 }
 
 aspect X {
 	// None of these match, the subject at execution(secureMethod()) does not have the annotation
-	// see http://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
+	// see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
 	before(): execution(@Secured * *Service+.*(..))  {	}
-	
+
 	before(): execution(@Secured * *Service.*(..))  {	}
 
 	before(): execution(@Secured * DemoService.*(..))  {	}
-	
+
 }
 
 public class Asp {
@@ -32,4 +32,3 @@ public class Asp {
 		new DemoServiceImpl().secureMethod();
 	}
 }
-
diff --git a/tests/bugs164/pr265695/AspNew.aj b/tests/bugs164/pr265695/AspNew.aj
index ae99590fb..3f61600e6 100644
--- a/tests/bugs164/pr265695/AspNew.aj
+++ b/tests/bugs164/pr265695/AspNew.aj
@@ -11,17 +11,14 @@ interface DemoService {
     void secureMethod();
 }
 
-
 class DemoServiceImpl implements DemoService {
-    public void secureMethod() {    }    
+    public void secureMethod() {    }
 }
 
 aspect X {
 	// None of these match, the subject at execution(secureMethod()) does not have the annotation
-	// see http://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
+	// see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html
 	before(): execution(@Secured! * *Service+.*(..))  {	}
-	
-	
 }
 
 public class AspNew {
@@ -29,4 +26,3 @@ public class AspNew {
 		new DemoServiceImpl().secureMethod();
 	}
 }
-
diff --git a/tests/bugs1810/508661/aop.xml b/tests/bugs1810/508661/aop.xml
index 5b89e6614..bf1e9b9e0 100644
--- a/tests/bugs1810/508661/aop.xml
+++ b/tests/bugs1810/508661/aop.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
+<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "https://www.eclipse.org/aspectj/dtd/aspectj.dtd">
 <aspectj>
 	<weaver>
 	</weaver>