Upgrade license from CPLv1/EPLv1 to EPLv2

This was required by the Eclipse team as one precondition for the next
release.

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

5 files changed, 83 insertions, 83 deletions

diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java
index ae3d79554..5d915e1ac 100644
--- a/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java
+++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2004 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Wes Isberg     initial implementation
  * ******************************************************************/
 
 import org.aspectj.testing.Tester;
diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java
index 1de505a78..f4f52b5d3 100644
--- a/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java
+++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2004 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Wes Isberg     initial implementation
  * ******************************************************************/
 
 import org.aspectj.testing.Tester;
@@ -29,7 +29,7 @@ public class InterfaceMethodDeclarationFull {
 interface I {}
 
 aspect A {
-    abstract public int I.getInt();  
+    abstract public int I.getInt();
     before() : execution(int getInt()) && target(I) {
         Tester.event("before-execution");
     }
diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java
index a1998f6c0..590a208a8 100644
--- a/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java
+++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2004 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Wes Isberg     initial implementation
  * ******************************************************************/
 
 import org.aspectj.testing.Tester;
diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java
index be568c46f..97630395d 100644
--- a/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java
+++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2004 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Wes Isberg     initial implementation
  * ******************************************************************/
 
 import org.aspectj.testing.Tester;
diff --git a/tests/bugs/seven/lint/Main.java b/tests/bugs/seven/lint/Main.java
index 24aa38b3e..3bc98c382 100644
--- a/tests/bugs/seven/lint/Main.java
+++ b/tests/bugs/seven/lint/Main.java
@@ -1,13 +1,13 @@
 /*
  * Copyright (c) 2005 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Created on 25.03.2005
- * 
+ *
  * Contributors
  *  Oliver Boehm               initial implementation
  */
@@ -19,64 +19,64 @@ import org.aspectj.lang.annotation.SuppressAjWarnings;
  * Test Aspect to check the different Xlint warnings
  */
 aspect XlintTest {
-    
+
     /*
      * examples for "invalidAbsoluteTypeName"
      */
- 
+
     pointcut correctName() :
         call(String java.lang.Object.toString());
-    
+
     pointcut wrongPackageName() :
         call(String java.xxx.Object.toString());
-    
+
     pointcut wrongTypeName() :
         call(String java.lang.Xxx.toString());
-    
+
     /** no warning!!! */
     pointcut wrongMethodName() :
         call(String java.lang.Object.xxx());
-    
+
     @SuppressAjWarnings
     after() : call(String java.lang.Xxx.toString()) {
         System.out.println(thisJoinPoint);
     }
-    
-    
-    
+
+
+
     /*
      * no example for "invalidWildcardTypeName"
-     * 
+     *
      * Never signalled anywhere in the codebase
      * @see http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg01404.html
      */
 
-    
-    
+
+
     /*
      * example for "unresolvableMember"
-     * 
+     *
      * hard to reproduce - I tried different things but at last I give up
      * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=59596#c2
      */
-    
-    
-    
+
+
+
     /*
      * example for "typeNotExposedToWeaver"
      */
-    
+
     public int Object.dummy = 0;
-    
-    
-    
+
+
+
     /*
      * 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
      */
-    
+
 
 
     /*
@@ -88,35 +88,35 @@ aspect XlintTest {
 
     pointcut matchedToStringCall() :
         call(String Object.toString()) && target(Car);
-    
+
     before() : unmatchedToStringCall() && !within(XlintTest) {
         System.out.println(thisJoinPoint);
     }
-        
+
     @SuppressAjWarnings
     before() : call(String Car.toString()) {
         System.out.println(thisJoinPoint);
     }
-    
+
     @SuppressAjWarnings({"adviceDidNotMatch"})
     before() : call(* java.lang.String.helloWorld()) {
         System.out.println(thisJoinPoint);
     }
-    
-        
+
+
     /*
      * example for "canNotImplementLazyTjp"
-     * 
+     *
      * This example is from the README-12.html. To get the warning you must
      * compile it with "-XlazyTjp"
-     * 
+     *
      * NOTE: The expected warnung does not appear. I don't know why.
      *       Here is the commandline:
      *       ajc -XlazyTjp -Xlint:warning -inpath src -d classes src
      */
-    
+
     public static boolean enabled = false;
-    
+
     pointcut toBeTraced() : execution(* *(..)) && !within(XlintTest);
 
     Object around() : toBeTraced() && if(enabled) {
@@ -125,20 +125,20 @@ aspect XlintTest {
         return proceed();
     }
 
-    
-    
+
+
     /*
      * example for "needsSerialVersionUIDField"
      */
-    
+
     declare parents : Main implements java.io.Serializable;
-    
-    
-    
+
+
+
     /*
      * example for "brokeSerialVersionCompatibility"
-     * 
-     * NOTE: I don't see this warning inside Eclipse with 
+     *
+     * NOTE: I don't see this warning inside Eclipse with
      *      AJDT 1.2.0.20050308091611 although I activate the warning
      *      via the project properties.
      *      I see it only when I start the compiler from the commandline
@@ -147,15 +147,15 @@ aspect XlintTest {
 
     public int Car.breakSerial = 1;
 
-    
-    
+
+
     /*
      * example for "noInterfaceCtorJoinpoint"
      */
-    
+
     pointcut interfaceConstructor() :
         execution(java.util.List.new());
-    
+
 }
 
 class Car implements Serializable {}
@@ -171,7 +171,7 @@ public class Main extends Object {
         Long l = new Long(1);
         String s = l.toString();
     }
-    
+
     public void run() {
         new Car().toString();
     }