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>

17 files changed, 148 insertions, 148 deletions

diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java
index 1d0a546dd..4ce172479 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java
@@ -2,10 +2,10 @@
  * 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
+ *
  * ******************************************************************/
 package org.aspectj.systemtest.incremental;
 
@@ -32,12 +32,12 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		super.setUp();
 		AjState.FORCE_INCREMENTAL_DURING_TESTING = true;
 	}
-	
+
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		AjState.FORCE_INCREMENTAL_DURING_TESTING = false;
 	}
-  
+
   public void test001() throws Exception {
     runTest("expect class added in initial incremental tests");
     nextIncrement(false);
@@ -97,7 +97,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
     deleteFileAndDoIncrementalBuild("src/Target.java",messageSpec);
     nextIncrement(false);
     copyFileAndDoIncrementalBuild("changes/Main.50.java","src/Main.java");
-    run("Main");    
+    run("Main");
   }
 
   public void test007() throws Exception {
@@ -113,7 +113,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
     copyFileAndDoIncrementalBuild("changes/Main.20.java","src/app/Main.java");
     run("app.Main");
   }
-  
+
   /**
    * See bug report 85297.  We plugged a hole so that we check whether the contents of
    * directories on the classpath have changed when deciding whether we can do an
@@ -175,7 +175,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
     copyFileAndDoIncrementalBuild("changes/Aspect.20.java","src/Aspect.java",messageSpec);
     run("Main");
   }
-  
+
   public void testIncrementalResourceAdditionToInPath() throws Exception {
       runTest("incremental with addition of resource to inpath directory");
       RunResult result = run("Hello");
@@ -186,14 +186,14 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
       // resources are *NOT* copied from inpath directories
       assertFalse("Resource file should not exist yet",new File(ajc.getSandboxDirectory(),"AResourceFile.txt").exists());
   }
-  
+
   public void testAdditionOfResourceToInJar() throws Exception {
       runTest("incremental with addition of resource to inpath jar");
       nextIncrement(true);
       assertFalse("Resource file should not exist yet",new File(ajc.getSandboxDirectory(),"AResourceFile.txt").exists());
       copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
       // resources *are* copied from inpath jars
-      assertAdded("AResourceFile.txt");      
+      assertAdded("AResourceFile.txt");
   }
 
   public void testRemovalOfResourceFromInJar() throws Exception {
@@ -202,15 +202,15 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
       assertAdded("AResourceFile.txt");
       copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
       // resources *are* copied from inpath jars
-      assertDeleted("AResourceFile.txt");      
+      assertDeleted("AResourceFile.txt");
   }
-  
+
   public void testAdditionOfClassToInPathJar() throws Exception {
       runTest("incremental with addition of class to inpath jar");
       nextIncrement(true);
       assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists());
       copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
-      assertAdded("Hello2.class");      
+      assertAdded("Hello2.class");
   }
 
   public void testRemovalOfClassFromInPathJar() throws Exception {
@@ -218,15 +218,15 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
       nextIncrement(true);
       assertAdded("Hello2.class");
       copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
-      assertDeleted("Hello2.class");      
+      assertDeleted("Hello2.class");
   }
-  
+
   public void testAdditionOfClassToInJarJar() throws Exception {
       runTest("incremental with addition of class to injar jar");
       nextIncrement(true);
       assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists());
       copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
-      assertAdded("Hello2.class");      
+      assertAdded("Hello2.class");
   }
 
   public void testRemovalOfClassFromInJarJar() throws Exception {
@@ -234,15 +234,15 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
       nextIncrement(true);
       assertAdded("Hello2.class");
       copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
-      assertDeleted("Hello2.class");      
+      assertDeleted("Hello2.class");
   }
-  
+
   public void testAdditionOfClassToInPathDir() throws Exception {
       runTest("incremental with addition of class to inpath dir");
       nextIncrement(true);
       assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists());
       copyFileAndDoIncrementalBuild("changes/Hello2.20.class", "indir/Hello2.class");
-      assertAdded("Hello2.class");      
+      assertAdded("Hello2.class");
   }
 
   public void testRemovalOfClassFromInPathDir() throws Exception {
@@ -250,9 +250,9 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
       nextIncrement(true);
       assertAdded("Hello2.class");
       deleteFileAndDoIncrementalBuild("indir/Hello2.class");
-      assertDeleted("Hello2.class");      
+      assertDeleted("Hello2.class");
   }
-   
+
   public void testUpdateOfClassInInPathDir() throws Exception {
       runTest("incremental with update of class in inpath dir");
       nextIncrement(true);
@@ -262,20 +262,20 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
       RunResult after = run("Hello");
       assertTrue("Should say updated hello",after.getStdOut().startsWith("updated hello"));
   }
-  
+
   public void testUsesPointcutRelsWhenReferringToPCTIn2ndFile_pr90806() throws Exception {
 	    runTest("NPE in genHandleIdentifier");
 	    nextIncrement(true);
 	    copyFileAndDoIncrementalBuild("changes/X.20.aj","src/X.aj");
   }
-  
+
   public void testPersistingDeow_pr84033() throws Exception {
 	  runTest("incremental declare error persists after fix");
 	  copyFileAndDoIncrementalBuild("changes/Aspect.20.java", "src/pack/Aspect.java");
       nextIncrement(true);
 	  RunResult before = run("pack.Main");
   }
-  
+
   public void testIncrementalUpdateOfBodyInAroundAdvice_pr154054() throws Exception {
 	  runTest("incremental update of body in around advice");
 	  nextIncrement(true);
@@ -288,7 +288,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	  assertTrue("value should be 14 but was " + after.getStdOut(),
 			  after.getStdOut().startsWith("14"));
   }
-  
+
   public void testIncrementalUpdateOfBodyInAroundAdviceWithString_pr154054() throws Exception {
 	  runTest("incremental update of body in around advice with string");
 	  nextIncrement(true);
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
index 521248ddb..e7dc2a7c5 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
@@ -2,10 +2,10 @@
  * 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
+ *
  * ******************************************************************/
 package org.aspectj.systemtest.incremental.model;
 
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java
index 0a6538ef9..d9858ce42 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * 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
+ * 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:
  *    Adrian Colyer      initial implementation
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
index bac2ec86c..0f776db9c 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
@@ -1,9 +1,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:
  *     Andy Clement      initial implementation
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.java
index 6b431c1df..92ff1eb06 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.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          Converted to new interface (bug 148190)
  *******************************************************************/
@@ -18,9 +18,9 @@ package org.aspectj.systemtest.incremental.tools;
  */
 public class AjdeInteractionTestbedLauncher extends
 		MultiProjectIncrementalTests {
-	
+
 	/**
-	 * usage: AjdeInteractionTestbedLauncher srcDir projectName 
+	 * usage: AjdeInteractionTestbedLauncher srcDir projectName
 	 * @param args workspace_root_dir project_name
 	 */
 	public static void main(String[] args) throws Exception {
@@ -31,17 +31,17 @@ public class AjdeInteractionTestbedLauncher extends
 		//launcher.printBuildReport();
 		launcher.tearDown();
 	}
-	
+
 	public AjdeInteractionTestbedLauncher(String projectName) {
 		String classPath = System.getProperty("java.class.path");
 		((MultiProjTestCompilerConfiguration)getCompilerForProjectWithName(projectName)
 				.getCompilerConfiguration()).setClasspath(classPath);
 	}
-	
+
 	private void buildProject(String projectName) {
 		initialiseProject(projectName);
 		build(projectName);
 	}
-	
-	
+
+
 }
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java
index 086c8ce95..4e3416835 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
- * Copyright (c) 2014 Contributors 
+ * Copyright (c) 2014 Contributors
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * 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:
  *    Andy Clement - initial API and implementation
@@ -19,8 +19,8 @@ import java.util.Map;
 import org.aspectj.util.FileUtil;
 
 public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAjdeInteractionTestbed {
-	
-	
+
+
 	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
@@ -35,7 +35,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 			new File("../run-all-junit-tests/generated").delete();
 		}
 	}
-	
+
 	// Basic test: turns on annotation processing and tries to run the DemoProcessor
 	public void testAnnotationProcessing1() throws Exception {
 		createAndBuildAnnotationProcessorProject("ProcessorProject");
@@ -49,7 +49,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 		javaOptions.put("org.eclipse.jdt.core.compiler.source", "1.6");
 		javaOptions.put("org.eclipse.jdt.core.compiler.processAnnotations","enabled");
 		configureJavaOptionsMap("ProcessorConsumer1", javaOptions);
-		
+
 		configureNewProjectDependency("ProcessorConsumer1", "ProcessorProject");
 		configureNonStandardCompileOptions("ProcessorConsumer1", "-showWeaveInfo");
 		build("ProcessorConsumer1");
@@ -59,18 +59,18 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 		String out = runMethod("ProcessorConsumer1", "Code", "runner");
 		assertEquals("aaa running\nccc running\n",out.replace("\r",""));
 	}
-	
+
 	// services file in processor project
 	public void testAnnotationProcessing2() throws Exception {
 		createAndBuildAnnotationProcessorProject("ProcessorProject2"); // This has a META-INF services entry for DemoProcessor
-		
-		initialiseProject("ProcessorConsumer2"); 
+
+		initialiseProject("ProcessorConsumer2");
 		// Paths here are the path to DemoProcessor (compiled into the output folder of the ProcessorProject2) and the path to
 		// the META-INF file declaring DemoProcessor (since it is not copied to that same output folder) - this exists in the test src
 		// folder for ProcessorProject2
 		configureProcessorPath("ProcessorConsumer2", getCompilerForProjectWithName("ProcessorProject2").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString()+File.pathSeparator+
 				new File(testdataSrcDir + File.separatorChar + "ProcessorProject2" + File.separatorChar + "base"+File.separatorChar+"src").toString());
-		
+
 		Map<String, String> javaOptions = new Hashtable<>();
 		javaOptions.put("org.eclipse.jdt.core.compiler.compliance", "1.6");
 		javaOptions.put("org.eclipse.jdt.core.compiler.codegen.targetPlatform", "1.6");
@@ -81,29 +81,29 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 		configureNewProjectDependency("ProcessorConsumer2", "ProcessorProject");
 		configureNonStandardCompileOptions("ProcessorConsumer2", "-showWeaveInfo");
 		build("ProcessorConsumer2");
-		checkWasFullBuild();	
+		checkWasFullBuild();
 		checkCompiledFiles("ProcessorConsumer2","Advise_ccc.java","Advise_aaa.java","Code.java");
 		assertEquals(2,getWeavingMessages("ProcessorConsumer2").size());
 		String out = runMethod("ProcessorConsumer2", "Code", "runner");
 		assertEquals("aaa running\nccc running\n",out.replace("\r",""));
 	}
-	
+
 	// Two processors
 	public void testAnnotationProcessing3() throws Exception {
 		createAndBuildAnnotationProcessorProject("ProcessorProject2");
 		createAndBuildAnnotationProcessorProject("ProcessorProject3");
 		initialiseProject("ProcessorConsumer1");
 		// Paths here are the path to DemoProcessor/DemoProcessor2 compiled code and the path to
-		// the META-INF file declaring DemoProcessor/DemoProcessor2 (since they are not copied to that same output folder) - 
+		// the META-INF file declaring DemoProcessor/DemoProcessor2 (since they are not copied to that same output folder) -
 		// these exists in the test src folders for ProcessorProject2/ProcessorProject3
-		configureProcessorPath("ProcessorConsumer1", 
+		configureProcessorPath("ProcessorConsumer1",
 				getCompilerForProjectWithName("ProcessorProject3").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString()+File.pathSeparator+
 				new File(testdataSrcDir + File.separatorChar + "ProcessorProject3" + File.separatorChar + "base"+File.separatorChar+"src").toString()
 				+File.pathSeparator+
 				getCompilerForProjectWithName("ProcessorProject2").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString()+File.pathSeparator+
 				new File(testdataSrcDir + File.separatorChar + "ProcessorProject2" + File.separatorChar + "base"+File.separatorChar+"src").toString()
 				);
-		
+
 		// The order here is DemoProcessor2 then DemoProcessor - to get the second one to run I changed DemoProcessor2 to operate on a
 		// specific annotation (java.lang.SuppressWarnings) and return false at the end
 
@@ -115,7 +115,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 		javaOptions.put("org.eclipse.jdt.core.compiler.source", "1.6");
 		javaOptions.put("org.eclipse.jdt.core.compiler.processAnnotations","enabled");
 		configureJavaOptionsMap("ProcessorConsumer1", javaOptions);
-		
+
 		configureNewProjectDependency("ProcessorConsumer1", "ProcessorProject");
 		configureNonStandardCompileOptions("ProcessorConsumer1", "-showWeaveInfo");
 		build("ProcessorConsumer1");
@@ -125,7 +125,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 		String out = runMethod("ProcessorConsumer1", "Code", "runner");
 		assertEquals("aaa running\nAround advice on aaa running\nccc running\nAround advice on ccc running\n",out.replace("\r",""));
 	}
-	
+
 	// Tests:
 	// TODO Incremental compilation - what does that mean with annotation processors?
 
@@ -143,7 +143,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 		// Assume all processors from processor project
 		configureProcessorPath(projectName, getCompilerForProjectWithName("ProcessorProject").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString());
 	}
-	
+
 	private void checkCompiledFiles(String projectName, String... expectedCompiledFiles) {
 		List<String> compiledFiles = new ArrayList<>(getCompiledFiles(projectName));
 		if (compiledFiles.size()!=expectedCompiledFiles.length) {
@@ -165,6 +165,6 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj
 			fail("These were not expected to be compiled: "+compiledFiles);
 		}
 	}
-	
-	
+
+
 }
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java
index 78caba4ea..52d1540c4 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.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 (bug 148190)
  *******************************************************************/
 package org.aspectj.systemtest.incremental.tools;
@@ -22,7 +22,7 @@ import org.aspectj.ajde.core.AjCompiler;
 public class CompilerFactory {
 
 	private static Map<String,AjCompiler> compilerMap = new Hashtable<>();
-	
+
 	/**
 	 * If an AjCompiler exists for the given projectDir then returns
 	 * that, otherwise creates a new one.
@@ -31,7 +31,7 @@ public class CompilerFactory {
 		if (compilerMap.containsKey(projectDir)) {
 			return (AjCompiler) compilerMap.get(projectDir);
 		}
-		
+
 		AjCompiler compiler = new AjCompiler(
 				projectDir,
 				new MultiProjTestCompilerConfiguration(projectDir),
@@ -40,9 +40,9 @@ public class CompilerFactory {
 		compilerMap.put(projectDir,compiler);
 		return compiler;
 	}
-	
+
 	/**
-	 * Clears the current map - before doing so clears the state of 
+	 * Clears the current map - before doing so clears the state of
 	 * each compiler (this ensures everything is cleaned up in the
 	 * IncrementalStateManager)
 	 */
@@ -53,5 +53,5 @@ public class CompilerFactory {
 		}
 		compilerMap.clear();
 	}
-	
+
 }
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java
index e0a7c2437..54cfa7bec 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 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://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     Andy Clement (SpringSource)         initial implementation
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.java
index 3f2afc409..588b9dbce 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.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.systemtest.incremental.tools;
@@ -52,7 +52,7 @@ public class IncrementalOutputLocationManagerTests extends AbstractMultiProjectI
 
 		public void reportFileRemove(String outputfile, int filetype) {
 		}
-		
+
 		public Map<File,String> getInpathMap() {
 			return Collections.emptyMap();
 		}
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java
index c4076fc97..a29b502a3 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2008 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) 2008 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 implementation
  *******************************************************************/
 package org.aspectj.systemtest.incremental.tools;
@@ -16,7 +16,7 @@ import org.aspectj.ajde.core.ICompilerConfiguration;
 
 /**
  * Testing the performance of incremental compilation as it would be in AJDT.
- * 
+ *
  * @author AndyClement
  */
 public class IncrementalPerformanceTests extends AbstractMultiProjectIncrementalAjdeInteractionTestbed {
@@ -28,7 +28,7 @@ public class IncrementalPerformanceTests extends AbstractMultiProjectIncremental
 	 * <li>Second build is an incremental build with no changes at all.
 	 * <li>Third build is an incremental build with just a source file touched (not changed).
 	 * </ul>
-	 * 
+	 *
 	 * <p>
 	 * 162-dev, 28Aug08 times: Thinkpad T61p: 3203/3140/3234/3156 173/172/172/172 313/297/297/312
 	 */
@@ -170,4 +170,4 @@ public class IncrementalPerformanceTests extends AbstractMultiProjectIncremental
 		testdataSrcDir = "../tests/multiIncremental";
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.java
index dc19e2993..7da7447dc 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.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.systemtest.incremental.tools;
@@ -28,9 +28,9 @@ import org.aspectj.weaver.bcel.UnwovenClassFile;
 /**
  * Similar to OutputLocationManagerTests, however, tests the different scenarios when no outputDir is set but instead there is an
  * OutputLocationManager which returns the same output location for all files and resources.
- * 
+ *
  * There are eight places where AjBuildConfig.getOutputDir() is called that are tested here:
- * 
+ *
  * AjBuildManager.getOutputClassFileName(..) - testCorrectInfoWhenNoOutputPath AjBuildManager.initBcelWorld(..) -
  * testPathResolutionWithInpathDirAndNoOutputPath testPathResolutionWithInpathJarAndNoOutputPath AjBuildManager.writeManifest(..) -
  * testCopyManifest AjBuildManager.writeOutxml(..) - testOutxml - testOutXmlForAspectsWithDifferentOutputDirs
@@ -38,9 +38,9 @@ import org.aspectj.weaver.bcel.UnwovenClassFile;
  * testAjStateDeleteResources AjState.maybeDeleteResources(..) - testAjStateDeleteResourcesInInputDir
  * AjState.removeAllResultsOfLastBuild(..) - testAllResourcesAreDeletedCorrectlyOnPathChange
  * IncrementalStateManager.findStateManagingOutputLocation(..) - testFindStateManagingOutputLocation
- * 
+ *
  * The other three places are not tested here because they were implemented when OutputLocationManager was introduced.
- * 
+ *
  */
 public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncrementalAjdeInteractionTestbed {
 
@@ -211,11 +211,11 @@ public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncremen
 	// public void testAjStateDeleteResources() {
 	// String inpathDir = inpathTestingDir + File.separator + "inpathJar.jar";
 	// addInpathEntry(inpathDir);
-	//		
+	//
 	// build("inpathTesting");
-	//		
+	//
 	// AjState state = getState();
-	//		
+	//
 	// String resource = expectedOutputDir + File.separator + "inpathResource.txt";
 	// File f = new File(resource);
 	// assertTrue("expected file " + resource + " to exist but it did not",f.exists());
@@ -250,7 +250,7 @@ public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncremen
 	// } finally {
 	// AjBuildManager.COPY_INPATH_DIR_RESOURCES = false;
 	// }
-	//		
+	//
 	// }
 	/**
 	 * Changing inpath entry from a jar to a directory between builds means that AjState should realise somethings changed. This
@@ -336,7 +336,7 @@ public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncremen
 		public File getOutputLocationForClass(File compilationUnit) {
 			return outputLoc;
 		}
-		
+
 		@Override
 		public Map<File,String> getInpathMap() {
 			return Collections.emptyMap();
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.java
index bbdb4a379..002af0073 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.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.systemtest.incremental.tools;
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
index a4af3112d..f3dd09c4d 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.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/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java
index 24018e001..5e293daa0 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.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.systemtest.incremental.tools;
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.java
index bb04e515b..d48fab523 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.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.systemtest.incremental.tools;
@@ -41,7 +41,7 @@ public class MultiProjTestOutputLocationManager implements IOutputLocationManage
 		initLocations();
 		return classOutputLoc;
 	}
-	
+
 	public Map getInpathMap() {
 		return Collections.EMPTY_MAP;
 	}
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 8e5db450f..b132bfc92 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -1,9 +1,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:
  *     Andy Clement          initial implementation
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.java
index 6f6be1256..6fe5d0bd2 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.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      Converted to new interface (bug 148190)
  *******************************************************************/
@@ -105,7 +105,7 @@ public class OutputLocationManagerTests extends AbstractMultiProjectIncrementalA
 
 		public void reportFileRemove(String outputfile, int filetype) {
 		}
-		
+
 		public Map<File,String> getInpathMap() {
 			return Collections.emptyMap();
 		}