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>

7 files changed, 69 insertions, 69 deletions

diff --git a/weaver/testinputdata/org/aspectj/weaver/test/DynamicHelloWorld.java b/weaver/testinputdata/org/aspectj/weaver/test/DynamicHelloWorld.java
index 62a2affb5..71e30683d 100644
--- a/weaver/testinputdata/org/aspectj/weaver/test/DynamicHelloWorld.java
+++ b/weaver/testinputdata/org/aspectj/weaver/test/DynamicHelloWorld.java
@@ -1,12 +1,12 @@
 /* Copyright (c) 2002 Contributors.
- * 
- * 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: 
- *     PARC     initial implementation 
+ *
+ * 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:
+ *     PARC     initial implementation
  */
 package org.aspectj.weaver.test;
 
@@ -32,7 +32,7 @@ public class DynamicHelloWorld implements Serializable {
 		}
 		throw new RuntimeException("should have caught exception");
     }
-    
+
     String doit(String s, List l) {
     	l.add(s);   // this will throw an exception
     	return l.toString();
diff --git a/weaver/testinputdata/org/aspectj/weaver/test/FancyHelloWorld.java b/weaver/testinputdata/org/aspectj/weaver/test/FancyHelloWorld.java
index 0ad272d40..3eb97e7c4 100644
--- a/weaver/testinputdata/org/aspectj/weaver/test/FancyHelloWorld.java
+++ b/weaver/testinputdata/org/aspectj/weaver/test/FancyHelloWorld.java
@@ -1,12 +1,12 @@
 /* Copyright (c) 2002 Contributors.
- * 
- * 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: 
- *     PARC     initial implementation 
+ *
+ * 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:
+ *     PARC     initial implementation
  */
 package org.aspectj.weaver.test;
 
@@ -27,7 +27,7 @@ public abstract class FancyHelloWorld {
     		out.println("finally");
     	}
     }
-    
+
     public static String getName() {
     	int x = 0;
     	x += "name".hashCode();
diff --git a/weaver/testinputdata/org/aspectj/weaver/test/FieldyHelloWorld.java b/weaver/testinputdata/org/aspectj/weaver/test/FieldyHelloWorld.java
index 57686a84c..8106baef6 100644
--- a/weaver/testinputdata/org/aspectj/weaver/test/FieldyHelloWorld.java
+++ b/weaver/testinputdata/org/aspectj/weaver/test/FieldyHelloWorld.java
@@ -1,12 +1,12 @@
 /* Copyright (c) 2002 Contributors.
- * 
- * 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: 
- *     PARC     initial implementation 
+ *
+ * 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:
+ *     PARC     initial implementation
  */
 package org.aspectj.weaver.test;
 
@@ -16,7 +16,7 @@ public class FieldyHelloWorld {
 
     public static void main(String[] args) {
         str += " World";
-        
-        System.out.println(str);  
+
+        System.out.println(str);
     }
 }
diff --git a/weaver/testinputdata/org/aspectj/weaver/test/HelloWorld.java b/weaver/testinputdata/org/aspectj/weaver/test/HelloWorld.java
index 1424b269a..44a0e9c09 100644
--- a/weaver/testinputdata/org/aspectj/weaver/test/HelloWorld.java
+++ b/weaver/testinputdata/org/aspectj/weaver/test/HelloWorld.java
@@ -1,12 +1,12 @@
 /* Copyright (c) 2002 Contributors.
- * 
- * 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: 
- *     PARC     initial implementation 
+ *
+ * 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:
+ *     PARC     initial implementation
  */
 package org.aspectj.weaver.test;
 
@@ -18,7 +18,7 @@ public class HelloWorld {
 
     public static void main(String[] args) {
         System.out
-        .println("hello world");  
+        .println("hello world");
         //System.out.println("hello world");
     }
 }
diff --git a/weaver/testinputdata/org/aspectj/weaver/test/MultiArgHelloWorld.java b/weaver/testinputdata/org/aspectj/weaver/test/MultiArgHelloWorld.java
index d83701f8e..4b3e7382c 100644
--- a/weaver/testinputdata/org/aspectj/weaver/test/MultiArgHelloWorld.java
+++ b/weaver/testinputdata/org/aspectj/weaver/test/MultiArgHelloWorld.java
@@ -1,12 +1,12 @@
 /* Copyright (c) 2002 Contributors.
- * 
- * 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: 
- *     PARC     initial implementation 
+ *
+ * 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:
+ *     PARC     initial implementation
  */
 package org.aspectj.weaver.test;
 
@@ -15,7 +15,7 @@ public class MultiArgHelloWorld {
     public static void main(String[] args) {
     	foo("Hello", "World");
     }
-    
+
     static void foo(Object s, Object t) {
     	System.out.println(s + " " + t);
     }
diff --git a/weaver/testinputdata/org/aspectj/weaver/test/Test.java b/weaver/testinputdata/org/aspectj/weaver/test/Test.java
index 50ca00bac..b2b2a7463 100644
--- a/weaver/testinputdata/org/aspectj/weaver/test/Test.java
+++ b/weaver/testinputdata/org/aspectj/weaver/test/Test.java
@@ -1,12 +1,12 @@
 /* Copyright (c) 2002 Contributors.
- * 
- * 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: 
- *     PARC     initial implementation 
+ *
+ * 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:
+ *     PARC     initial implementation
  */
 package org.aspectj.weaver.test;
 
diff --git a/weaver/testinputdata/org/aspectj/weaver/test/TestSwitchy.java b/weaver/testinputdata/org/aspectj/weaver/test/TestSwitchy.java
index 72f539b72..86ae00159 100644
--- a/weaver/testinputdata/org/aspectj/weaver/test/TestSwitchy.java
+++ b/weaver/testinputdata/org/aspectj/weaver/test/TestSwitchy.java
@@ -1,12 +1,12 @@
 /* Copyright (c) 2002 Contributors.
- * 
- * 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: 
- *     PARC     initial implementation 
+ *
+ * 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:
+ *     PARC     initial implementation
  */
 package org.aspectj.weaver.test;
 
@@ -22,10 +22,10 @@ public abstract class TestSwitchy {
 
 
     public int i = 3;
-    
+
     public static final int j = 4;
-    
-    
+
+
     public static void main(String[] args) {
         switch (args.length) {
             case 0: System.err.println("hi");
@@ -35,9 +35,9 @@ public abstract class TestSwitchy {
         }
         System.err.println("done");
     }
-    
-    
+
+
     abstract int goo();
-    
-    void nimbo() {}   
+
+    void nimbo() {}
 }