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>

13 files changed, 56 insertions, 56 deletions

diff --git a/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java b/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java
index 352156f82..ffdcf8212 100644
--- a/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java
+++ b/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2005-2019 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *******************************************************************************/
 package org.aspectj.loadtime;
 
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/AjTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/AjTest.java
index d8f8fa85a..03e17d25a 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/AjTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/AjTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
  * Contributors:
  *     Matthew Webster - initial implementation
  *******************************************************************************/
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
index 77603e12c..4bd7e1d1f 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
  * Contributors:
  *     Matthew Webster - initial implementation
  *******************************************************************************/
@@ -703,4 +703,4 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 	}
 }
 
-// --- testclasses and aspects ---
\ No newline at end of file
+// --- testclasses and aspects ---
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/LoadtimeTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/LoadtimeTest.java
index 94fae75e2..0d2dca4f7 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/LoadtimeTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/LoadtimeTest.java
@@ -1,10 +1,10 @@
 /* *******************************************************************
  * Copyright (c) 2005-2019 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
  * ******************************************************************/
 package org.aspectj.weaver.loadtime;
 
@@ -18,7 +18,7 @@ import junit.framework.TestCase;
  */
 public class LoadtimeTest extends TestCase {
 
-    public void testPremain() throws Exception {            
+    public void testPremain() throws Exception {
         Class<?>[] paramTypes = {String.class, Instrumentation.class };
         assertNotNull(Agent.class.getMethod("premain", paramTypes));
     }
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java
index 98ecf1bae..591cec56a 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
  * Contributors:
  *     Matthew Webster - initial implementation
  *******************************************************************************/
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
 public class WeavingContextTest extends TestCase {
 
 	private boolean called;
-	
+
 	public void testWeavingContext() {
 		URLClassLoader loader = new URLClassLoader(new URL[] {},null);
 		IWeavingContext context = new TestWeavingContext(loader);
@@ -40,11 +40,11 @@ public class WeavingContextTest extends TestCase {
 				called = true;
 				return super.getResources(name);
 			}
-			
+
 		};
 		ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
 		adaptor.initialize(loader,context);
-		
+
 		assertTrue("IWeavingContext not called",called);
 	}
 
@@ -55,7 +55,7 @@ public class WeavingContextTest extends TestCase {
 			public String getBundleIdFromURL(URL url) {
 				throw new UnsupportedOperationException();
 			}
-			
+
 		};
 		ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
 		try {
@@ -74,11 +74,11 @@ public class WeavingContextTest extends TestCase {
 				called = true;
 				return super.getClassLoaderName();
 			}
-			
+
 		};
 		ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
 		adaptor.initialize(loader,context);
-		
+
 		assertTrue("IWeavingContext not called",called);
 	}
 
@@ -92,11 +92,11 @@ public class WeavingContextTest extends TestCase {
 				called = true;
 				return super.getFile(url);
 			}
-			
+
 		};
 		ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
 		adaptor.initialize(loader,context);
-		
+
 		assertTrue("IWeavingContext not called",called);
 	}
 
@@ -110,11 +110,11 @@ public class WeavingContextTest extends TestCase {
 				called = true;
 				return super.getId();
 			}
-			
+
 		};
 		ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
 		adaptor.initialize(loader,context);
-		
+
 		assertTrue("IWeavingContext not called",called);
 	}
 
@@ -128,22 +128,22 @@ public class WeavingContextTest extends TestCase {
 				called = true;
 		        return super.getDefinitions(loader,adaptor);
 			}
-			
+
 		};
 		ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
 		adaptor.initialize(loader,context);
-		
+
 		assertTrue("getDefinitions not called",called);
 	}
-	
+
 	private static class TestWeavingContext implements IWeavingContext {
 
 		private ClassLoader loader;
-		
+
 		public TestWeavingContext (ClassLoader classLoader) {
 			this.loader = classLoader;
 		}
-		
+
 		public String getBundleIdFromURL(URL url) {
 			return null;
 		}
@@ -151,7 +151,7 @@ public class WeavingContextTest extends TestCase {
 		public String getClassLoaderName() {
 			return "ClassLoaderName";
 		}
-		
+
 		public ClassLoader getClassLoader() { return this.loader;}
 
 		public String getFile(URL url) {
@@ -177,7 +177,7 @@ public class WeavingContextTest extends TestCase {
 	        if (parent != null) {
 	            URL parentURL = parent.getResource(asResource);
 	            if (localURL.equals(parentURL)) isLocallyDefined =  false;
-	        } 
+	        }
 	        return isLocallyDefined;
 		}
 
@@ -191,5 +191,5 @@ public class WeavingContextTest extends TestCase {
 
 		this.called = false;
 	}
-	
+
 }
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
index e540ae09b..612b3c29a 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM Corporation
  * 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:
  *     Matthew Webster     initial implementation
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/test/DocumentParserTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/test/DocumentParserTest.java
index b0b55d725..25444b5d9 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/test/DocumentParserTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/test/DocumentParserTest.java
@@ -2,9 +2,9 @@
  * 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
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *   Alexandre Vasseur         initial implementation
diff --git a/loadtime/src/test/java/testdata/Apples.java b/loadtime/src/test/java/testdata/Apples.java
index 2d216c1ea..e38d837a8 100644
--- a/loadtime/src/test/java/testdata/Apples.java
+++ b/loadtime/src/test/java/testdata/Apples.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2009 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *  Andy Clement
diff --git a/loadtime/src/test/java/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java b/loadtime/src/test/java/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java
index 4efd665eb..ee529eeb5 100644
--- a/loadtime/src/test/java/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java
+++ b/loadtime/src/test/java/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2009 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *  Andy Clement
diff --git a/loadtime/src/test/java/testdata/MySqlStatement.java b/loadtime/src/test/java/testdata/MySqlStatement.java
index 3f7048610..523cc4d5d 100644
--- a/loadtime/src/test/java/testdata/MySqlStatement.java
+++ b/loadtime/src/test/java/testdata/MySqlStatement.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2009 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *  Andy Clement
@@ -167,7 +167,7 @@ public abstract class MySqlStatement implements Statement {
 
 	public void setPoolable(boolean poolable) throws SQLException {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	public boolean isWrapperFor(Class<?> iface) throws SQLException {
diff --git a/loadtime/src/test/java/testdata/Oranges.java b/loadtime/src/test/java/testdata/Oranges.java
index d634bb8db..0aadfdd71 100644
--- a/loadtime/src/test/java/testdata/Oranges.java
+++ b/loadtime/src/test/java/testdata/Oranges.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2009 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *  Andy Clement
diff --git a/loadtime/src/test/java/testdata/sub/Apples.java b/loadtime/src/test/java/testdata/sub/Apples.java
index 6f666892f..e80a1fe4b 100644
--- a/loadtime/src/test/java/testdata/sub/Apples.java
+++ b/loadtime/src/test/java/testdata/sub/Apples.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2009 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *  Andy Clement
diff --git a/loadtime/src/test/java/testdata/sub/Oranges.java b/loadtime/src/test/java/testdata/sub/Oranges.java
index f1828c001..e53a54f52 100644
--- a/loadtime/src/test/java/testdata/sub/Oranges.java
+++ b/loadtime/src/test/java/testdata/sub/Oranges.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2009 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *  Andy Clement