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>

19 files changed, 136 insertions, 136 deletions

diff --git a/asm/src/main/java/org/aspectj/asm/AsmManager.java b/asm/src/main/java/org/aspectj/asm/AsmManager.java
index cbebe2842..e81b91b4d 100644
--- a/asm/src/main/java/org/aspectj/asm/AsmManager.java
+++ b/asm/src/main/java/org/aspectj/asm/AsmManager.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: 
- *     Mik Kersten     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:
+ *     Mik Kersten     initial implementation
  *    Andy Clement     incremental support and switch on/off state
  * ******************************************************************/
 
@@ -46,7 +46,7 @@ import org.aspectj.util.IStructureModel;
  * The Abstract Structure Model (ASM) represents the containment hierarchy and crosscutting structure map for AspectJ programs. It
  * is used by IDE views such as the document outline, and by other tools such as ajdoc to show both AspectJ declarations and
  * crosscutting links, such as which advice affects which join point shadows.
- * 
+ *
  * @author Mik Kersten
  * @author Andy Clement
  */
@@ -287,7 +287,7 @@ public class AsmManager implements IStructureModel {
 	public String getCanonicalFilePath(File f) {
 		return canonicalFilePathMap.get(f);
 	}
-	
+
 	public CanonicalFilePathMap getCanonicalFilePathMap() {
 		return canonicalFilePathMap;
 	}
@@ -657,15 +657,15 @@ public class AsmManager implements IStructureModel {
 
 	/**
 	 * two kinds of relationships
-	 * 
+	 *
 	 * A affects B B affectedBy A
-	 * 
+	 *
 	 * Both of these relationships are added when 'B' is modified. Concrete examples are 'advises/advisedby' or
 	 * 'annotates/annotatedby'.
-	 * 
+	 *
 	 * What we need to do is when 'B' is going to be woven, remove all relationships that may reoccur when it is woven. So - remove
 	 * 'affects' relationships where the target is 'B', remove all 'affectedBy' relationships where the source is 'B'.
-	 * 
+	 *
 	 */
 	public void removeRelationshipsTargettingThisType(String typename) {
 		boolean debug = false;
diff --git a/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java b/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java
index 7629f7c68..4cc2fdfc5 100644
--- a/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java
+++ b/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2003,2010 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: 
- *     Mik Kersten     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:
+ *     Mik Kersten     initial implementation
  *     Andy Clement
  * ******************************************************************/
 
@@ -26,7 +26,7 @@ public abstract class HierarchyWalker {
 	}
 
 	protected void postProcess(IProgramElement node) {
-	} 
+	}
 
 	public IProgramElement process(IProgramElement node) {
 		preProcess(node);
diff --git a/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java b/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java
index 02a2a3474..d6a3b6947 100644
--- a/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java
+++ b/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java
@@ -2,9 +2,9 @@
  * 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
+ * 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:
  *     Mik Kersten     initial implementation
diff --git a/asm/src/main/java/org/aspectj/asm/IHierarchy.java b/asm/src/main/java/org/aspectj/asm/IHierarchy.java
index cadbb6549..681617942 100644
--- a/asm/src/main/java/org/aspectj/asm/IHierarchy.java
+++ b/asm/src/main/java/org/aspectj/asm/IHierarchy.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2003,2010 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:
  *     Mik Kersten     initial implementation
diff --git a/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java b/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java
index 3a9323113..e80eb1d73 100644
--- a/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java
+++ b/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java
@@ -2,9 +2,9 @@
  * 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
+ * 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:
  *     Mik Kersten     initial implementation
diff --git a/asm/src/main/java/org/aspectj/asm/IModelFilter.java b/asm/src/main/java/org/aspectj/asm/IModelFilter.java
index f5181b7cb..863d890b5 100644
--- a/asm/src/main/java/org/aspectj/asm/IModelFilter.java
+++ b/asm/src/main/java/org/aspectj/asm/IModelFilter.java
@@ -1,20 +1,20 @@
 /* *******************************************************************
  * Copyright (c) 2006 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: 
- *     Andy Clement IBM     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:
+ *     Andy Clement IBM     initial implementation
  * ******************************************************************/
 package org.aspectj.asm;
 
 /**
  * When dumping the model out (for debugging/testing), various parts of it can be passed through this filter. Currently it is used
  * to ensure the source locations we dump out are independent of sandbox directory.
- * 
+ *
  * @author Andy Clement
  */
 public interface IModelFilter {
diff --git a/asm/src/main/java/org/aspectj/asm/IProgramElement.java b/asm/src/main/java/org/aspectj/asm/IProgramElement.java
index 95c796b65..276bb1c5b 100644
--- a/asm/src/main/java/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/main/java/org/aspectj/asm/IProgramElement.java
@@ -2,9 +2,9 @@
  * 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
+ * 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:
  *     Mik Kersten     initial implementation
diff --git a/asm/src/main/java/org/aspectj/asm/IRelationship.java b/asm/src/main/java/org/aspectj/asm/IRelationship.java
index 61c67eb8c..c0b35c105 100644
--- a/asm/src/main/java/org/aspectj/asm/IRelationship.java
+++ b/asm/src/main/java/org/aspectj/asm/IRelationship.java
@@ -2,9 +2,9 @@
  * 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
+ * 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:
  *     Mik Kersten     initial implementation
diff --git a/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java b/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java
index 9d03aef75..bf9d8f968 100644
--- a/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java
+++ b/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java
@@ -2,9 +2,9 @@
  * 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
+ * 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:
  *     Mik Kersten     initial implementation
diff --git a/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.java
index 4efe0401e..74c48a1b6 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.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: 
- *     Mik Kersten     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:
+ *     Mik Kersten     initial implementation
  *     Andy Clement    Extensions for better IDE representation
  * ******************************************************************/
 
@@ -114,7 +114,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 
 	/**
 	 * Returns the first match
-	 * 
+	 *
 	 * @param parent
 	 * @param kind not null
 	 * @return null if not found
@@ -149,7 +149,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 
 	/**
 	 * Find the entry in the model that represents a particular type.
-	 * 
+	 *
 	 * @param packageName the package in which the type is declared or null for the default package
 	 * @param typeName the name of the type
 	 * @return the IProgramElement representing the type, or null if not found
@@ -217,7 +217,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 	/**
 	 * Look for any package nodes matching the specified package name. There may be multiple in the case where the types within a
 	 * package are split across source folders.
-	 * 
+	 *
 	 * @param packagename the packagename being searched for
 	 * @return a list of package nodes that match that name
 	 */
@@ -356,7 +356,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 
 	/**
 	 * Never returns null
-	 * 
+	 *
 	 * @param sourceFilePath canonicalized path for consistency
 	 * @param lineNumber if 0 or 1 the corresponding file node will be returned
 	 * @return a new structure node for the file if it was not found in the model
@@ -383,7 +383,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 
 	/**
 	 * Discover the node representing a particular source file.
-	 * 
+	 *
 	 * @param node where in the model to start looking (usually the root on the initial call)
 	 * @param sourcefilePath the source file being searched for
 	 * @return the node representing that source file or null if it cannot be found
@@ -442,7 +442,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 
 	/**
 	 * For a specified node, check if any of the children more accurately represent the specified line.
-	 * 
+	 *
 	 * @param node where to start looking
 	 * @param lineno the line number
 	 * @return any closer match below 'node' or null if nothing is a more accurate match
diff --git a/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java b/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java
index bf5330a11..6d44ecf6c 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java
@@ -1,18 +1,18 @@
 /********************************************************************
- * Copyright (c) 2006 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 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2006 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
  *******************************************************************/
 package org.aspectj.asm.internal;
 
 /**
  * Taken from org.aspectj.org.eclipse.jdt.core.compiler.CharOperation
- * 
+ *
  */
 public class CharOperation {
 
diff --git a/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java b/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java
index 9bbfc307c..2732d109f 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2006 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 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2006 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
  *******************************************************************/
 package org.aspectj.asm.internal;
diff --git a/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java
index 0ae669502..0c8271441 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2006 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 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2006 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
  *******************************************************************/
 package org.aspectj.asm.internal;
@@ -20,11 +20,11 @@ import org.aspectj.bridge.ISourceLocation;
 
 /**
  * Creates JDT-like handles, for example
- * 
+ *
  * method with string argument: <tjp{Demo.java[Demo~main~\[QString; method with generic argument:
  * <pkg{MyClass.java[MyClass~myMethod~QList\<QString;>; an aspect: <pkg*A1.aj}A1 advice with Integer arg:
  * <pkg*A8.aj}A8&afterReturning&QInteger; method call: <pkg*A10.aj[C~m1?method-call(void pkg.C.m2())
- * 
+ *
  */
 public class JDTLikeHandleProvider implements IElementHandleProvider {
 
@@ -151,7 +151,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider {
 	/**
 	 * Determine a count to be suffixed to the handle, this is only necessary for identical looking entries at the same level in the
 	 * model (for example two anonymous class declarations). The format is !<n> where n will be greater than 2.
-	 * 
+	 *
 	 * @param ipe the program element for which the handle is being constructed
 	 * @return a char suffix that will either be empty or of the form "!<n>"
 	 */
diff --git a/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java b/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java
index 395d0d42b..9e691eef3 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2006 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 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2006 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
  *******************************************************************/
 package org.aspectj.asm.internal;
@@ -100,7 +100,7 @@ public class NameConvertor {
 	/**
 	 * Given a char array, returns the type name for this. For example 'I' returns 'int', 'Ljava/lang/String' returns
 	 * 'java.lang.String' and '[Ljava/lang/String' returns 'java.lang.String[]'
-	 * 
+	 *
 	 * NOTE: Doesn't go any deaper so given 'Ljava/lang/String;<Ljava/lang/String;>' it would return
 	 * 'java.lang.String;<Ljava.lang.String;>', however, only called with something like 'Ljava/lang/String'
 	 */
@@ -220,7 +220,7 @@ public class NameConvertor {
 	 * Convert a typename into its handle form. There are various cases to consider here - many are discussed in pr249216. The flag
 	 * allreadyFQd indicates if we've already included a fq'd name in what we are creating - if we have then further references
 	 * should not be fq'd and can be the short name (so java.util.Set becomes just Set).
-	 * 
+	 *
 	 */
 
 	/**
diff --git a/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java
index a35709bc1..06dd1c6c6 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2003,2010 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: 
- *     Mik Kersten     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:
+ *     Mik Kersten     initial implementation
  *     Andy Clement, IBM, SpringSource    Extensions for better IDE representation
  * ******************************************************************/
 
@@ -611,7 +611,7 @@ public class ProgramElement implements IProgramElement {
 
 	/**
 	 * Convenience mechanism for setting new modifiers which do not require knowledge of the private internal representation
-	 * 
+	 *
 	 * @param newModifier
 	 */
 	public void addModifiers(IProgramElement.Modifiers newModifier) {
diff --git a/asm/src/main/java/org/aspectj/asm/internal/Relationship.java b/asm/src/main/java/org/aspectj/asm/internal/Relationship.java
index 8bd4a7e66..af4eba6a1 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/Relationship.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/Relationship.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2003,2010 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: 
- *     Mik Kersten     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:
+ *     Mik Kersten     initial implementation
  *     Andy Clement    Extensions for better IDE representation
  * ******************************************************************/
 package org.aspectj.asm.internal;
@@ -76,7 +76,7 @@ public class Relationship implements IRelationship {
 	/**
 	 * Return the direction of the relationship. It might be affects or affected-by. The direction enables the incremental model
 	 * repair code to do the right thing.
-	 * 
+	 *
 	 * @return true if is an affects relationship: advises/declareson/softens/matchedby/declaredon/annotates
 	 */
 	public boolean isAffects() {
diff --git a/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java b/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java
index a9bca8a1d..d3f18f144 100644
--- a/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2003,2010 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: 
- *     Mik Kersten     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:
+ *     Mik Kersten     initial implementation
  *     Andy Clement
  * ******************************************************************/
 
diff --git a/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java b/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java
index 96a384366..d948de9c7 100644
--- a/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java
+++ b/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java
@@ -1,15 +1,15 @@
 package org.aspectj.asm;
 /* *******************************************************************
- * 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
  * ******************************************************************/
 
 
@@ -18,7 +18,7 @@ import junit.framework.TestSuite;
 
 public class AsmModuleTests extends TestCase {
 
-    public static TestSuite suite() { 
+    public static TestSuite suite() {
         TestSuite suite = new TestSuite(AsmModuleTests.class.getName());
         suite.addTestSuite(NameConvertorTest.class);
         return suite;
@@ -27,4 +27,4 @@ public class AsmModuleTests extends TestCase {
     public AsmModuleTests(String name) { super(name); }
 
     public void testNothing() {}
-}  
+}
diff --git a/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java b/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java
index f52d4f045..4c168a871 100644
--- a/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java
+++ b/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2006 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 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2006 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
  *******************************************************************/
 package org.aspectj.asm;