8 files changed, 69 insertions, 74 deletions
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>