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>

30 files changed, 242 insertions, 242 deletions

diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/AjCompiler.java b/ajde.core/src/main/java/org/aspectj/ajde/core/AjCompiler.java
index d6231a05f..d6acebf8f 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/AjCompiler.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/AjCompiler.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 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) 2007 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 (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.core;
@@ -24,7 +24,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
  * The class to be used by tools to drive a build. An AjCompiler is created with a unique id (for example the absolute pathname of a
  * project or .lst file) along with implementations of ICompilerConfiguration, IBuildProgressMonitor and IBuildMessageHandler. Tools
  * then call build() or buildFresh() on this AjCompiler.
- * 
+ *
  * <p>
  * An AjCompiler is associated with one id, therefore a new one needs to be created for a new id (project, .lst file etc.). It is
  * the responsibility of the tools to manage the lifecycle of the AjCompiler's.
@@ -40,7 +40,7 @@ public class AjCompiler {
 	/**
 	 * Creates a new AjCompiler for the given id, ICompilerConfiguration, IBuildProgressMonitor and IBuildMessageHandler. None of
 	 * the arguments can be null.
-	 * 
+	 *
 	 * @param compilerId - Unique String used to identify this AjCompiler
 	 * @param compilerConfig - ICompilerConfiguration implementation
 	 * @param buildProgressMonitor - IBuildProgressMonitor implementation
@@ -138,10 +138,10 @@ public class AjCompiler {
 
 	/**
 	 * Set a CustomMungerFactory to the compiler's weaver
-	 * 
+	 *
 	 * The type of factory should be org.aspectj.weaver.CustomMungerFactory but due to dependency problem of project ajde.core, it
 	 * is Object for now.
-	 * 
+	 *
 	 * @param factory
 	 */
 	public void setCustomMungerFactory(Object factory) {
@@ -150,7 +150,7 @@ public class AjCompiler {
 
 	/**
 	 * @return the CustomMungerFactory from the compiler's weaver
-	 * 
+	 *
 	 *         The return type should be org.aspectj.weaver.CustomMungerFactory but due to dependency problem of project ajde.core,
 	 *         it is Object for now.
 	 */
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildMessageHandler.java b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildMessageHandler.java
index 064e37c92..da2c7b275 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildMessageHandler.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildMessageHandler.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 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) 2007 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 (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.core;
@@ -16,13 +16,13 @@ import org.aspectj.bridge.IMessage;
 /**
  * Interface that handles messages sent from the compiler.
  * Implementations define which messages are logged and whether
- * the handler aborts the process.  
+ * the handler aborts the process.
  */
 public interface IBuildMessageHandler {
 
-	/** 
+	/**
 	 * Handle message by reporting and/or throwing an AbortException.
-	 * 
+	 *
 	 * @param message the IMessage to handle - never null
 	 * @return true if this message was handled by this handler
 	 * @throws IllegalArgumentException if message is null
@@ -32,25 +32,25 @@ public interface IBuildMessageHandler {
 
 	/**
 	 * Signal whether this will ignore messages of a given type.
-	 * Clients may use this to avoid constructing or sending 
+	 * Clients may use this to avoid constructing or sending
 	 * certain messages.
-	 * 
+	 *
 	 * @return true if this handler is ignoring all messages of this type
 	 */
 	boolean isIgnoring(IMessage.Kind kind);
 
     /**
-     * Allow fine grained configuration after initialization. 
-     *  
+     * Allow fine grained configuration after initialization.
+     *
      * @param kind
      */
     void dontIgnore(IMessage.Kind kind);
-    
+
     /**
-     * Allow fine grained configuration after initialization. 
-     *  
+     * Allow fine grained configuration after initialization.
+     *
      * @param kind
      */
     void ignore(IMessage.Kind kind);
-	
+
 }
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildProgressMonitor.java b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildProgressMonitor.java
index da45fdf20..a4f64acb6 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildProgressMonitor.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildProgressMonitor.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/ICompilerConfiguration.java b/ajde.core/src/main/java/org/aspectj/ajde/core/ICompilerConfiguration.java
index 7cd1148a7..5c098d558 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/ICompilerConfiguration.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/ICompilerConfiguration.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/IOutputLocationManager.java b/ajde.core/src/main/java/org/aspectj/ajde/core/IOutputLocationManager.java
index 270d47038..913de3d72 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/IOutputLocationManager.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/IOutputLocationManager.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: 
+ * 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:
  *   Adrian Colyer			Initial implementation
  *   Helen Hawkins          bug 166580 and 148190
  * ******************************************************************/
@@ -25,7 +25,7 @@ public interface IOutputLocationManager {
 	 * Return the directory root under which the results of compiling the given source file. For example, if the source file
 	 * contains the type a.b.C, and this method returns "target/classes" the resulting class file will be written to
 	 * "target/classes/a/b/C.class"
-	 * 
+	 *
 	 * @param compilationUnit the compilation unit that has been compiled
 	 * @return a File object representing the root directory under which compilation results for this unit should be written
 	 */
@@ -34,7 +34,7 @@ public interface IOutputLocationManager {
 	/**
 	 * For environments where multiple source folders are supported, they need to be included in the model. This method allows
 	 * AspectJ to determine which source folder a source file came from. Example return values would be "src" or "main/java"
-	 * 
+	 *
 	 * @param sourceFile the File object for the source file
 	 * @return the source folder where this file came from, or null if in project root or source folders not supported.
 	 */
@@ -43,7 +43,7 @@ public interface IOutputLocationManager {
 	/**
 	 * When copying resources from source folders to output location, return the root directory under which the resource should be
 	 * copied.
-	 * 
+	 *
 	 * @param resource the resource to be copied
 	 * @return a File object representing the root directory under which this resource should be copied
 	 */
@@ -63,7 +63,7 @@ public interface IOutputLocationManager {
 	/**
 	 * Callback from the compiler to indicate that a file has been written to disk, the type of the file (if known) is also
 	 * supplied.
-	 * 
+	 *
 	 * @param outputfile the file that has been written
 	 * @param fileType the kind of file from the FILETYPE_XXX constants defined in this type
 	 */
@@ -77,7 +77,7 @@ public interface IOutputLocationManager {
 	/**
 	 * Callback from the compiler to indicate that a file has been removed from disk, the type of the file (if known) is also
 	 * supplied.
-	 * 
+	 *
 	 * @param file the file that has been written
 	 * @param fileType the kind of file from the FILETYPE_XXX constants defined in this type
 	 */
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
index cab96198b..8ebaa664d 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 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) 2007 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 (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.core;
@@ -19,7 +19,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
  * Class containing the current custom java options
  */
 public final class JavaOptions {
-	
+
 	public static final String COMPLIANCE_LEVEL = CompilerOptions.OPTION_Compliance;
 	public static final String SOURCE_COMPATIBILITY_LEVEL = CompilerOptions.OPTION_Source;
 	public static final String TARGET_COMPATIBILITY_LEVEL = CompilerOptions.OPTION_TargetPlatform;
@@ -28,46 +28,46 @@ public final class JavaOptions {
 	public static final String VERSION_14 = CompilerOptions.VERSION_1_4;
 	public static final String VERSION_15 = CompilerOptions.VERSION_1_5;
 	public static final String VERSION_16 = CompilerOptions.VERSION_1_6;
-	
-	// by default will use the platform default encoding 
+
+	// by default will use the platform default encoding
 	public static final String CHARACTER_ENCODING = CompilerOptions.OPTION_Encoding;
-	
+
 	// indicates if unused/optimizable local variables need to be preserved (debugging purpose)
 	public static final String PRESERVE_ALL_LOCALS = CompilerOptions.OPTION_PreserveUnusedLocal;
 	public static final String PRESERVE = CompilerOptions.PRESERVE;
 	public static final String OPTIMIZE = CompilerOptions.OPTIMIZE_OUT;
-	
+
 	// Warning constants
 	public static final String WARN_METHOD_WITH_CONSTRUCTOR_NAME = CompilerOptions.OPTION_ReportMethodWithConstructorName;
-	public static final String WARN_OVERRIDING_PACKAGE_DEFAULT_METHOD = CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod;	
-	public static final String WARN_DEPRECATION = CompilerOptions.OPTION_ReportDeprecation;	
-	public static final String WARN_HIDDEN_CATCH_BLOCKS = CompilerOptions.OPTION_ReportHiddenCatchBlock;	
-	public static final String WARN_UNUSED_LOCALS = CompilerOptions.OPTION_ReportUnusedLocal;	
-	public static final String WARN_UNUSED_PARAMETER = CompilerOptions.OPTION_ReportUnusedParameter;	
-	public static final String WARN_UNUSED_IMPORTS = CompilerOptions.OPTION_ReportUnusedImport;	
-	public static final String WARN_SYNTHETIC_ACCESS = CompilerOptions.OPTION_ReportSyntheticAccessEmulation;	
-	public static final String WARN_ASSERT_IDENITIFIER = CompilerOptions.OPTION_ReportAssertIdentifier;	
+	public static final String WARN_OVERRIDING_PACKAGE_DEFAULT_METHOD = CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod;
+	public static final String WARN_DEPRECATION = CompilerOptions.OPTION_ReportDeprecation;
+	public static final String WARN_HIDDEN_CATCH_BLOCKS = CompilerOptions.OPTION_ReportHiddenCatchBlock;
+	public static final String WARN_UNUSED_LOCALS = CompilerOptions.OPTION_ReportUnusedLocal;
+	public static final String WARN_UNUSED_PARAMETER = CompilerOptions.OPTION_ReportUnusedParameter;
+	public static final String WARN_UNUSED_IMPORTS = CompilerOptions.OPTION_ReportUnusedImport;
+	public static final String WARN_SYNTHETIC_ACCESS = CompilerOptions.OPTION_ReportSyntheticAccessEmulation;
+	public static final String WARN_ASSERT_IDENITIFIER = CompilerOptions.OPTION_ReportAssertIdentifier;
 	public static final String WARN_NON_NLS = CompilerOptions.OPTION_ReportNonExternalizedStringLiteral;
 	// warning option constants
 	public static final String IGNORE = CompilerOptions.IGNORE;
 	public static final String WARNING = CompilerOptions.WARNING;
-	
-	// Debug constants	
+
+	// Debug constants
 	public static final String DEBUG_SOURCE = CompilerOptions.OPTION_SourceFileAttribute;
 	public static final String DEBUG_LINES  = CompilerOptions.OPTION_LocalVariableAttribute;
 	public static final String DEBUG_VARS   = CompilerOptions.OPTION_LineNumberAttribute;
 	// Debug option constants
 	public static final String GENERATE = CompilerOptions.GENERATE;
 	public static final String DO_NOT_GENERATE = CompilerOptions.DO_NOT_GENERATE;
-	
+
 	private static Map<String,String> defaultOptionsMap;
-	
+
 	/**
 	 * @return the java options map with the default settings
 	 */
 	public static Map<String,String> getDefaultJavaOptions() {
 		if (defaultOptionsMap != null) return defaultOptionsMap;
-		
+
 		defaultOptionsMap = new HashMap<>();
 		defaultOptionsMap.put(COMPLIANCE_LEVEL, VERSION_14);
 		defaultOptionsMap.put(SOURCE_COMPATIBILITY_LEVEL, VERSION_13);
@@ -85,10 +85,10 @@ public final class JavaOptions {
 		defaultOptionsMap.put(DEBUG_SOURCE, GENERATE);
 		defaultOptionsMap.put(DEBUG_LINES, GENERATE);
 		defaultOptionsMap.put(DEBUG_VARS, DO_NOT_GENERATE);
-		
+
 		return defaultOptionsMap;
 	}
-	
+
 	/**
 	 * @return true if the given value is a valid JVM version
 	 * (JavaOptions.VERSION_13, JavaOptions.VERSION_134, JavaOptions.VERSION_15,
@@ -100,23 +100,23 @@ public final class JavaOptions {
 	}
 
 	/**
-	 * @return true if the given option is JavaOptions.PRESERVE or 
+	 * @return true if the given option is JavaOptions.PRESERVE or
 	 * JavaOptions.OPTIMIZE and false otherwise
 	 */
 	public static boolean isValidPreserveAllLocalsOption(String option) {
 		return PRESERVE.equals(option) || OPTIMIZE.equals(option);
 	}
-	
+
 	/**
-	 * @return true if the given option is JavaOptions.IGNORE or 
+	 * @return true if the given option is JavaOptions.IGNORE or
 	 * JavaOptions.WARNING and false otherwise
 	 */
 	public static boolean isIgnoreOrWarning(String option) {
 		return IGNORE.equals(option) || WARNING.equals(option);
 	}
-	
+
 	/**
-	 * @return true if the given option is JavaOptions.GENERATE or 
+	 * @return true if the given option is JavaOptions.GENERATE or
 	 * JavaOptions.DO_NOT_GENERATE and false otherwise
 	 */
 	public static boolean isGenerateOrNot(String option) {
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
index e9f3a1b86..d98f26462 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java
index 9cc5ecfc9..eac68bc32 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
  * Copyright (c) 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: 
+ * 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
- *     Helen Hawkins  converted to new interface (pr148190) 
+ *     Helen Hawkins  converted to new interface (pr148190)
  * ******************************************************************/
 
 
@@ -18,8 +18,8 @@ import org.aspectj.ajde.core.IBuildProgressMonitor;
 import org.aspectj.bridge.IProgressListener;
 
 /**
- * Enables the compiler/weaver progres to be related to the user via the 
- * IBuildProgressMonitor as well as relating whether or not the user has 
+ * Enables the compiler/weaver progres to be related to the user via the
+ * IBuildProgressMonitor as well as relating whether or not the user has
  * cancelled the build progress back to the compiler/weaver.
  */
 public class AjdeCoreBuildNotifierAdapter implements IProgressListener {
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java
index 8cb53e047..0d2b0ff6b 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 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) 2007 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 (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.core.internal;
@@ -23,11 +23,11 @@ import org.aspectj.bridge.IMessage.Kind;
 public class AjdeCoreMessageHandlerAdapter implements IMessageHandler {
 
 	private IBuildMessageHandler handler;
-	
+
 	public AjdeCoreMessageHandlerAdapter(IBuildMessageHandler messageHandler) {
 		this.handler = messageHandler;
 	}
-	
+
 	public void dontIgnore(Kind kind) {
 		handler.dontIgnore(kind);
 	}
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/OutputLocationAdapter.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
index 7fe6a9cb1..51ec3f667 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
@@ -1,14 +1,14 @@
 /********************************************************************
- * 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: 
+ * 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:
  *   Adrian Colyer			Initial implementation
  *   Helen Hawkins          converted to new interface (bug 148190)
- *   
+ *
  *******************************************************************/
 package org.aspectj.ajde.core.internal;
 
@@ -64,7 +64,7 @@ public class OutputLocationAdapter implements CompilationResultDestinationManage
 
 	/**
 	 * Return a map from fully qualified jar/dir entries to handle components.
-	 * 
+	 *
 	 * @return a map from inpath entries (jars/dirs) to handle components.
 	 */
 	public Map<File,String> getInpathMap() {
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreModuleTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreModuleTests.java
index 45d70a845..178a8fe0a 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreModuleTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreModuleTests.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
index 2d17fc41e..cbf2246d3 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 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) 2007 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.ajde.core;
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
index e25632cf9..b1488fd01 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
index 0376836c1..2cee23cc6 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
index 8b707d1b7..d74fac8e9 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 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: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
index 6313dd4a2..8aff91042 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 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) 2007 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.ajde.core;
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
index b32ea2623..e9acb3ae8 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 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) 2007 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.ajde.core.tests;
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/BuildCancellingTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/BuildCancellingTest.java
index 75c37df84..7469cd226 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/BuildCancellingTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/BuildCancellingTest.java
@@ -1,12 +1,12 @@
 /********************************************************************
  * 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: 
+ * 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     Initial version
  *    Helen Hawkins    Converted to new interface (bug 148190)
  * ******************************************************************/
@@ -21,21 +21,21 @@ import org.aspectj.ajde.core.TestCompilerConfiguration;
  * weaving phases - this testcase verifies a few cases, making sure the process
  * stops when expected. It can check the disk contents, but it doesn't right
  * now.
- * 
+ *
  * Two different .lst files are used during these tests: LoadsaCode.lst and
  * EvenMoreCode.lst which contain mixes of aspects and classes
- * 
+ *
  * Here are some things to think about that will help you understand what is on
  * the disk when we cancel the compiler.
- * 
+ *
  * There are 3 important phases worth remembering : - Compile all the types -
  * Weave all the aspects - Weave all the classes
- * 
+ *
  * Each of those steps goes through all the types. This means during the 'weave
  * all the aspects' step we are jumping over classes and during the 'weave all
  * the classes ' step we are jumping over aspects. Why is this important?
- * 
- * 
+ *
+ *
  * We only write bytes out during the 'weave all the classes ' phase and it is
  * even during that phase that we write out the bytes for aspects. This means if
  * you cancel during compilation or during the weaving of aspects - there will
@@ -204,10 +204,10 @@ public class BuildCancellingTest extends AjdeCoreTestCase {
 	 * After first weave class message, get it to cancel, there should be one
 	 * more warning message about cancelling the weave and their should be
 	 * nothing on the disk.
-	 * 
+	 *
 	 * EvenMoreCode.lst contains: A1.aj Cl1.java A2.aj Cl2.java HW.java A3.aj
 	 * Cl3.java A4.aj
-	 * 
+	 *
 	 */
 	public void testCancelFirstClassWeave() {
 		if (debugTests)
@@ -238,10 +238,10 @@ public class BuildCancellingTest extends AjdeCoreTestCase {
 	 * After first weave aspect message, get it to cancel, there should be one
 	 * more warning message about cancelling the weave and their should be
 	 * nothing on the disk.
-	 * 
+	 *
 	 * EvenMoreCode.lst contains: A1.aj Cl1.java A2.aj Cl2.java HW.java A3.aj
 	 * Cl3.java A4.aj
-	 * 
+	 *
 	 */
 	public void testCancelSecondClassWeave() {
 		if (debugTests)
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/CompilerMessagesTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/CompilerMessagesTest.java
index 0284b3d10..e7846430e 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/CompilerMessagesTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/CompilerMessagesTest.java
@@ -1,12 +1,12 @@
 /* *******************************************************************
  * 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: 
+ * 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:
  *     AMC 2003         initial version
  *     Helen Hawkins    Converted to new interface (bug 148190)
  * ******************************************************************/
@@ -28,7 +28,7 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
 	private TestCompilerConfiguration compilerConfig;
 	private String[] files = { "apackage" + File.separator + "InitCatcher.java",
 			"apackage" + File.separator + "SomeClass.java" };
-	
+
 	protected void setUp() throws Exception {
 		super.setUp();
 		initialiseProject("declare-warning");
@@ -43,7 +43,7 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
 		handler = null;
 		compilerConfig = null;
 	}
-	
+
 	public void testMessages() {
 		// bug 33474
 		// The build has happened, what messages did the compiler give, and do they
@@ -53,7 +53,7 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
             assertTrue("not two messages: " + msgs, false);
         }
 		assertEquals("Two warning messages should be produced",2,msgs.size());
-		TestMessageHandler.TestMessage msg = 
+		TestMessageHandler.TestMessage msg =
 			(TestMessageHandler.TestMessage) msgs.get(0);
 		assertEquals( 8, msg.getContainedMessage().getSourceLocation().getLine());
 		assertEquals( "Please don't call init methods", msg.getContainedMessage().getMessage());
@@ -62,13 +62,13 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
 			// this name has a tester specific prefix, followed by the location of the file.
 			// we can validate the ending.
 			fullyQualifiedFile = fullyQualifiedFile.replace('\\','/');  // ignore platform differences in slashes
-			assertTrue( "Fully-qualified source file location returned", 
+			assertTrue( "Fully-qualified source file location returned",
 				fullyQualifiedFile.endsWith("/declare-warning/apackage/SomeClass.java"));
 		} catch (IOException ex) {
 			assertTrue( "Unable to convert source file location: " + msg.getContainedMessage().getSourceLocation().getSourceFile(), false);
 		}
 	}
-	
+
 	public void testDeclareMessageContents() {
 		List<TestMessage> msgs = handler.getMessages();
 		IMessage msg = ((TestMessageHandler.TestMessage)msgs.get(1)).getContainedMessage();
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
index c438715b7..019f9ae82 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2004 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
  *     Helen Hawkins   - Converted to new interface (bug 148190)
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
index ee54cef96..8e32116a0 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
  * 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: 
+ * 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     Copied/changed for -inpath testing 
+ *    Andy Clement     Copied/changed for -inpath testing
  *    Helen Hawkins    Changed to use new ajde interface (bug 148190)
  * ******************************************************************/
 package org.aspectj.ajde.core.tests;
@@ -67,7 +67,7 @@ public class InpathTest extends AjdeCoreTestCase {
 
 	/**
 	 * Inputs to the compiler: inpath = 'indir1/' source = 'src' output = a jar file
-	 * 
+	 *
 	 * Expected result = output jar file contains contents of indir1 and class file for source that was in src
 	 */
 	public void testInpathToOutjar() {
@@ -97,7 +97,7 @@ public class InpathTest extends AjdeCoreTestCase {
 
 	/**
 	 * Similar to the first test but outputs to a directory rather than a jar.
-	 * 
+	 *
 	 */
 	public void testInpathToBin() {
 		Set<File> inpath = new HashSet<>();
@@ -126,10 +126,10 @@ public class InpathTest extends AjdeCoreTestCase {
 	/**
 	 * Inputs to the compiler: inpath is 'indir2' that contains a helloworld source file and class file. source is 'src2' which
 	 * contains Aspect.java which weaves before advice into the HelloWorld code from 'indir2'
-	 * 
+	 *
 	 * Expected result: HelloWorld copied through to output jar and 'weaved'. Compiled version of Aspect.java put into the output
 	 * jar. The HelloWorld.java source file is also copied through to the output jar.
-	 * 
+	 *
 	 * An extra check is done at the end of this test to verify that HelloWorld has changed size (due to the weaving).
 	 */
 	public void testInpathToOutjar2() {
@@ -174,11 +174,11 @@ public class InpathTest extends AjdeCoreTestCase {
 
 	/**
 	 * More complex inpath - a jar and a directory
-	 * 
+	 *
 	 * Inputs: -inpath injar.jar;indir2 source is 'src2' which contains Aspect.java
-	 * 
+	 *
 	 * Expected result: Result should be a directory containing the contents of injar.jar and indir2 and the Aspect.class file.
-	 * 
+	 *
 	 */
 	public void testInpathAndInjarToBin() {
 		Set<File> inpath = new HashSet<>();
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/JarManifestTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/JarManifestTest.java
index 242c3e3f3..757d33a7c 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/JarManifestTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/JarManifestTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2004 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:
  *     IBM Corporation - initial API and implementation
  *     Helen Hawkins   - Converted to new interface (bug 148190)
@@ -27,7 +27,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 
 	private String[] weave = { "src" + File.separator + "Main.java",
 			"src" + File.separator + "Logging.aj" };
-	
+
 	private TestMessageHandler handler;
 	private TestCompilerConfiguration compilerConfig;
 
@@ -44,7 +44,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 		handler = null;
 		compilerConfig = null;
 	}
-	
+
 	public void testWeave () {
 		File outjar = openFile(outjarName);
 		compilerConfig.setOutjar(outjar.getAbsolutePath());
@@ -54,7 +54,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 				+ handler.getMessages(), handler.getMessages().isEmpty());
 		checkManifest(outjar);
 	}
-	
+
 	public void testNoWeave () {
 		File outjar = openFile(outjarName);
 		compilerConfig.setOutjar(outjar.getAbsolutePath());
@@ -65,7 +65,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 				+ handler.getMessages(), handler.getMessages().isEmpty());
 		checkManifest(outjar);
 	}
-	
+
 	private void checkManifest (File outjarFile) {
 		Manifest manifest = null;
 
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
index 64417e84c..f807e79e1 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
@@ -1,9 +1,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:
  *     Matthew Webster     initial implementation
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
index 3176f1e31..9d97fd81e 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
@@ -1,12 +1,12 @@
 /********************************************************************
- * 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 
+ * 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:
+ *     Mik Kersten      initial implementation
  *     Helen Hawkins    Converted to new interface (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.core.tests;
@@ -283,7 +283,7 @@ public class ResourceCopyTest extends AjdeCoreTestCase {
 
 	/**
 	 * Look in the specified jar file for resources (anything not .class) and add it the resources Set.
-	 * 
+	 *
 	 * @param injarFile jar file to open up
 	 * @param resources the set where resources should be accumulated
 	 * @param wantDirectories should any directories found in the jar be included
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
index c29f4ba21..fc5afe5b0 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
@@ -1,12 +1,12 @@
 /* *******************************************************************
  * 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: 
+ * 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     Initial version
  *    Helen Hawkins    Converted to new interface (bug 148190)
  * ******************************************************************/
@@ -55,9 +55,9 @@ public class ReweavableTest extends AjdeCoreTestCase {
 	/**
 	 * Aim: Check we haven't damaged 'normal compilation' when not supplying -Xreweavable. Also determines baseline sizes for the
 	 * compiled class files for later comparison.
-	 * 
+	 *
 	 * Inputs to the compiler: NonReweavable1.lst -> CalculatePI.java -> Logger.aj -> -verbose -> -noExit
-	 * 
+	 *
 	 * Expected result = Compile successful, the types will not be reweavable and the weaver should not report it is running in
 	 * reweavable mode.
 	 */
@@ -90,9 +90,9 @@ public class ReweavableTest extends AjdeCoreTestCase {
 	/**
 	 * Aim: Basic call to -Xreweavable. Weaver should report it is in reweavable mode and the classes produced should be much larger
 	 * than normal classes (those produced in the first test).
-	 * 
+	 *
 	 * Inputs to the compiler: Reweavable1.lst -> CalculatePI.java -> Logger.aj -> -Xreweavable -> -verbose -> -noExit
-	 * 
+	 *
 	 * Expected result = Compile successful, the types will be reweavable and the weaver should report it is running in reweavable
 	 * mode. The files produced should be larger than those created during the last test.
 	 */
@@ -137,10 +137,10 @@ public class ReweavableTest extends AjdeCoreTestCase {
 	 * Aim: Use the optional ':compress' modifier on -Xreweavable. This causes some of the meta-data for use in reweaving to be
 	 * compressed. It should succeed and produce class files smaller than straight -Xreweavable but larger than without specifying
 	 * -Xreweavable.
-	 * 
+	 *
 	 * Inputs to the compiler: ReweavableCompress1.lst -> CalculatePI.java -> Logger.aj -> -Xreweavable:compress -> -verbose ->
 	 * -noExit
-	 * 
+	 *
 	 * Expected result = Compile successful, the types will be reweavable and the weaver should report it is running in reweavable
 	 * mode. The files created should have a size between the non-reweavable versions and the reweavable (without compression)
 	 * versions.
@@ -200,11 +200,11 @@ public class ReweavableTest extends AjdeCoreTestCase {
 	 * Aim: The tests above have determined that reweaving appears to be behaving in terms of the .class files it is creating. Now
 	 * lets actually attempt a reweave. For this, we build two files as reweavable and then build a single file whilst specifying an
 	 * inpath that contains the .class files from the first compile. This should succeed.
-	 * 
+	 *
 	 * Inputs to the first compile: Reweavable1.lst -> CalculatePI.java -> Logger.aj -> -Xreweavable -> -verbose -> -noExit
-	 * 
+	 *
 	 * Input to the second compile: Reweavable2.lst -> SecondAspect.aj -> -Xreweavable -> -verbose -> -noExit -inpath bin\.
-	 * 
+	 *
 	 * Expected result = Both compiles will succeed.
 	 */
 	public void testReweavableSimpleCompile() {
@@ -247,11 +247,11 @@ public class ReweavableTest extends AjdeCoreTestCase {
 	/**
 	 * Aim: Based on the test above, if we delete Logger.class between the first and second compiles the second compile should fail
 	 * because there is not enough information to reweave CalculatePI
-	 * 
+	 *
 	 * Inputs to the first compile: Reweavable1.lst -> CalculatePI.java -> Logger.aj -> -Xreweavable -> -verbose -> -noExit
-	 * 
+	 *
 	 * Input to the second compile: Reweavable2.lst -> SecondAspect.aj -> -Xreweavable -> -verbose -> -noExit -inpath bin\.
-	 * 
+	 *
 	 * Expected result = Second compile will fail - reporting that Logger is missing (it 'touched' in the first compile CalculatePI)
 	 */
 	public void testForReweavableSimpleErrorCompile() {
@@ -296,11 +296,11 @@ public class ReweavableTest extends AjdeCoreTestCase {
 	/**
 	 * Aim: Based on the test above, if we delete Logger.class between the first and second compiles the second compile should fail
 	 * because there is not enough information to reweave CalculatePI
-	 * 
+	 *
 	 * Inputs to the first compile: TJP1.lst -> tjp/Demo.java -> tjp/GetInfo.java -> -Xreweavable -> -verbose -> -noExit
-	 * 
+	 *
 	 * Now, delete bin\tjp\GetInfo.class and do a compile with: TJP2.lst -> -Xreweavable -> -verbose -> -noExit -inpath bin\.
-	 * 
+	 *
 	 * Expected result = Second compile will fail - reporting that tjp.GetInfo is missing (it 'touched' in the first compile
 	 * tjp.Demo)
 	 */
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
index 1c8aa7108..543f70e2d 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
@@ -2,9 +2,9 @@
  * 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
+ * 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:
  *    Andy Clement     Initial version
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmDeclarationsTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmDeclarationsTest.java
index 6112e67a3..319abf0c3 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmDeclarationsTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmDeclarationsTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 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
+ * 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
  *
  * ******************************************************************/
 package org.aspectj.ajde.core.tests.model;
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmRelationshipsTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmRelationshipsTest.java
index 093de8cb7..2862f19c6 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmRelationshipsTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmRelationshipsTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 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
+ * 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
  *
  * ******************************************************************/
 
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTest.java
index 6430cead1..27f9058ae 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTest.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 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: 
- *     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
  *    Helen Hawkins    Converted to new interface (bug 148190)
  * ******************************************************************/
 package org.aspectj.ajde.core.tests.model;
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/StructureModelTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/StructureModelTest.java
index 6f06a1aa0..1af2b46b4 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/StructureModelTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/StructureModelTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 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
+ * 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