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>

4 files changed, 45 insertions, 45 deletions

diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
index 3a5f3b954..42762fc17 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
- * Copyright (c) 2003 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 
+ * Copyright (c) 2003 Contributors.
+ * 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
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -25,16 +25,16 @@ import java.util.List;
 import junit.framework.TestCase;
 
 /**
- * 
+ *
  */
 public class Ajc11CompilerAdapterTest extends TestCase {
     public static boolean LOGGING = false;
     List tempFiles = new ArrayList();
-    
+
     public Ajc11CompilerAdapterTest(String name) {
         super(name);
     }
-    
+
     public void tearDown() {
 		for (Object tempFile : tempFiles) {
 			File file = (File) tempFile;
@@ -42,14 +42,14 @@ public class Ajc11CompilerAdapterTest extends TestCase {
 			file.delete();
 		}
     }
-    
-//    public void testCompilerAdapterWithJavac() { // XXX requires tools.jar 
+
+//    public void testCompilerAdapterWithJavac() { // XXX requires tools.jar
 //        Javac javac = getJavac(new Project());
 //        setupTracingJava(javac);
 //        javac.execute();
 //    }
 
-    public void testCompilerAdapterWithAjc() { // XXX unverified        
+    public void testCompilerAdapterWithAjc() { // XXX unverified
         Project project = new Project();
         String cname = Ajc11CompilerAdapter.class.getName();
         project.setProperty("build.compiler", cname);
@@ -59,7 +59,7 @@ public class Ajc11CompilerAdapterTest extends TestCase {
         System.out.flush();
         javac.execute();
         log("---- second compile (none: nothing out of date?)...");
-        javac.execute(); 
+        javac.execute();
     }
 
     public void testCompilerAdapterWithAjcRecursively() { // XXX unverified
@@ -90,9 +90,9 @@ public class Ajc11CompilerAdapterTest extends TestCase {
         javac.setClasspath(new Path(project, rt.getAbsolutePath()));
         return javac;
     }
-    
+
     void setupTracingJava(Javac javac) { // XXX assumes module dir, doc loc
-        String exDir = "../docs/dist/doc/examples"; 
+        String exDir = "../docs/dist/doc/examples";
         javac.setSrcdir(new Path(javac.getProject(), exDir));
         javac.setIncludes("tracing/*.java"); // XXX assumes tracing example
     }
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
index e6ae8876b..0281d66d4 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
@@ -5,9 +5,9 @@
  *               2005 Contributors
  * All rights reserved.
  * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     Xerox/PARC     initial implementation
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
index 4527c6c9f..9a913f710 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * 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: 
- *     Xerox/PARC     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:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -21,7 +21,7 @@ import java.io.File;
 import junit.framework.TestCase;
 
 /**
- * 
+ *
  */
 public class AjdocTest extends TestCase {
 
@@ -43,7 +43,7 @@ public class AjdocTest extends TestCase {
         task.setClasspath(new Path(p, "../lib/test/aspectjrt.jar"));
         task.execute();
     }
-    
+
     public void testHelp() {
         Ajdoc task = new Ajdoc();
         Project p = new Project();
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java
index 99a21d4c1..840b76270 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * 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: 
- *     Xerox/PARC     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:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 package org.aspectj.tools.ant.taskdefs;
 
@@ -16,13 +16,13 @@ import junit.framework.*;
 
 public class TaskdefsModuleTests extends TestCase {
 
-    public static TestSuite suite() { 
+    public static TestSuite suite() {
         TestSuite suite = new TestSuite(TaskdefsModuleTests.class.getName());
-        suite.addTestSuite(Ajc11CompilerAdapterTest.class); 
-        suite.addTestSuite(AjdocTest.class); 
-        suite.addTestSuite(AjcTaskTest.class); 
+        suite.addTestSuite(Ajc11CompilerAdapterTest.class);
+        suite.addTestSuite(AjdocTest.class);
+        suite.addTestSuite(AjcTaskTest.class);
         return suite;
     }
 
     public TaskdefsModuleTests(String name) { super(name); }
-}  
+}