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>

12 files changed, 162 insertions, 162 deletions

diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java
index fa9d24e93..ae50afe8e 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
- * Copyright (c) 2000-2001 Xerox Corporation. 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * Copyright (c) 2000-2001 Xerox Corporation.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -45,7 +45,7 @@ public class Ajc10 extends MatchingTask {
 
     private static final List<String> VALID_XOPTIONS;
     static {
-        String[] xs = new String[] 
+        String[] xs = new String[]
             {   "lint", "serializableAspects", "targetNearSource", "OcodeSize",
                 "incrementalFile" };
         VALID_XOPTIONS = Collections.unmodifiableList(Arrays.asList(xs));
@@ -74,10 +74,10 @@ public class Ajc10 extends MatchingTask {
         reset();
     }
 
-    // ------------------------- options 
+    // ------------------------- options
     // find option types and whether ignored:
     //   sed -n '/void set/p' Ajc.java | sed 's/.*\/\/ //' | sort -u
-    //   sed -n '/ignoredOptions/d;/ignored/p' Ajc.java 
+    //   sed -n '/ignoredOptions/d;/ignored/p' Ajc.java
     // each option may be "ignored" and is one+ of:
     //   ajc-old             used to be an ajc option
     //   ajc-only            only an option for ajc, not javac
@@ -99,7 +99,7 @@ public class Ajc10 extends MatchingTask {
         }
         //this.version = version;
     }
-    
+
     public void setNocomments(boolean nocomments) { // ajc-only not-eajc docDone
         if (nocomments) {
             ignore("-nocomments");
@@ -108,14 +108,14 @@ public class Ajc10 extends MatchingTask {
     }
 
     public void setEmacssym(boolean input) {  // ajc-only  eajc-also docDone
-        setif(input, "-emacssym"); 
+        setif(input, "-emacssym");
     }
 
     public void setUsejavac(boolean input) {  // ajc-only not-eajc docDone
         if (input) {
             ignore("-usejavac");
         }
-        //setif(input, "-usejavac"); 
+        //setif(input, "-usejavac");
     }
 
     public void setPreprocess(boolean preprocess) { // ajc-only not-eajc docDone
@@ -137,7 +137,7 @@ public class Ajc10 extends MatchingTask {
     public void setOptimize(boolean optimize) { // javac-also ignored docDone
         setif(optimize, "-O");
     }
-   
+
 
     public void setClasspath(Path classpath) {  // javac-also eajc-also docDone
         if (this.classpath == null) {
@@ -151,12 +151,12 @@ public class Ajc10 extends MatchingTask {
             classpath = new Path(project);
         }
         return classpath.createPath();
-    }        
-    
+    }
+
     public void setClasspathref(Reference classpathref) {  // javac-also docDone
         createClasspath().setRefid(classpathref);
     }
-    
+
     public void setBootclasspath(Path bootclasspath) {  // javac-also not-eajc docDone
         ignore("bootclasspath"); // XXX may jury-rig
 //        if (this.bootclasspath == null) {
@@ -171,13 +171,13 @@ public class Ajc10 extends MatchingTask {
             bootclasspath = new Path(project);
         }
         return bootclasspath.createPath();
-    }    
-    
+    }
+
     public void setBootclasspathref(Reference bootclasspathref) {  // javac-also not-eajc docDone
         ignore("bootclasspath"); // XXX may jury-rig
 //        createBootclasspath().setRefid(bootclasspathref);
     }
-    
+
     public void setExtdirs(Path extdirs) {  // javac-also not-eajc docDone
         ignore("-extdirs");
 //        if (this.extdirs == null) {
@@ -193,7 +193,7 @@ public class Ajc10 extends MatchingTask {
             extdirs = new Path(project);
         }
         return extdirs.createPath();
-    }  
+    }
 
     public void setArgfile(File argfile) { // ajc-only eajc-also docDone
         if (argfiles == null) {
@@ -225,17 +225,17 @@ public class Ajc10 extends MatchingTask {
 
     public void setLenient(boolean input) {  // ajc-only not-eajc docDone
         ignore("-lenient");
-        //setif(input, "-lenient"); 
+        //setif(input, "-lenient");
     }
 
     public void setStrict(boolean input) {  // ajc-only not-eajc docDone
         ignore("-strict");
-        //setif(input, "-strict"); 
+        //setif(input, "-strict");
     }
 
     public void setPorting(boolean input) {  // ajc-only not-eajc docDone
         ignore("-porting");
-        //setif(input, "-porting"); 
+        //setif(input, "-porting");
     }
 
     public void setX(String input) {  // ajc-only eajc-also docDone
@@ -244,7 +244,7 @@ public class Ajc10 extends MatchingTask {
             String token = tokens.nextToken().trim();
             if (1 < token.length()) {
                 if (VALID_XOPTIONS.contains(token)) {
-                    setif(true, "-X" + token); 
+                    setif(true, "-X" + token);
                 } else {
                     ignore("-X" + token);
                 }
@@ -257,7 +257,7 @@ public class Ajc10 extends MatchingTask {
         ignore("-threads");
         //this.threads = threads;
     }
-    
+
     public void setDumpstack(boolean dumpstack) { // ajc-old
         ignore("-dumpstack");
         //setif(dumpstack, "-dumpstack");
@@ -277,8 +277,8 @@ public class Ajc10 extends MatchingTask {
             internalclasspath = new Path(project);
         }
         return internalclasspath.createPath();
-    }        
-    
+    }
+
     public void setInternalclasspathref(Reference internalclasspathref) { // ajc-taskdef only
         createInternalclasspath().setRefid(internalclasspathref);
     }
@@ -334,11 +334,11 @@ public class Ajc10 extends MatchingTask {
         ignore("-nosymbols");
         //setif(nosymbols, "-nosymbols");
     }
-    
+
     public void setDebug(boolean debug) { // javac-also eajc-also docDone
         setif(debug, "-g"); // todo: changed from -debug
     }
-    
+
     public void setDeprecation(boolean deprecation) { // javac-also eajc-also docDone
         setif(deprecation, "-deprecation"); // XXX eajc: also "warn:deprecation"
     }
@@ -358,7 +358,7 @@ public class Ajc10 extends MatchingTask {
     }
 
     // ------------------------- other state methods
-    
+
     protected final void ignore(String attribute) {
         ignoredOptions.add(attribute);
     }
@@ -368,7 +368,7 @@ public class Ajc10 extends MatchingTask {
             cmd.createArgument().setFile(file);
         }
     }
-    
+
     /** reset variables to permit gc */
     public void reset() {
         //version = false;
@@ -473,7 +473,7 @@ public class Ajc10 extends MatchingTask {
             }
         }
         log("Compiling " + numfiles + " source and " +
-            + numargfiles + " arg files" 
+            + numargfiles + " arg files"
             + (null == destdir ? "" : " to " + destdir.getPath()), Project.MSG_INFO);
 
          // here is the actual invocation
@@ -583,7 +583,7 @@ public class Ajc10 extends MatchingTask {
 	    	if (!verbose) {
 	  			handler.ignore(IMessage.INFO);
 	  		}
-	    	final IMessageHandler delegate 
+	    	final IMessageHandler delegate
 	    		= verbose ? MessagePrinter.VERBOSE: MessagePrinter.TERSE;
 			handler.setInterceptor(delegate);
 			holder = handler;
@@ -591,9 +591,9 @@ public class Ajc10 extends MatchingTask {
         try {
             String[] args = cmd.getCommandline();
             // XXX avoid rendering if not verbosely logging?
-            log("Running  in-process using " 
+            log("Running  in-process using "
                 + Ajc10.render(cmd.getCommandline()), Project.MSG_VERBOSE);
-        	
+
         	Main main = new Main();
         	main.run(args, holder);
         	int errs = holder.numMessages(IMessage.ERROR, true);
@@ -605,7 +605,7 @@ public class Ajc10 extends MatchingTask {
         } catch (Throwable t) {
             while (t instanceof AbortException) {
                 // check for "just quit -- message printed already"
-                if (((AbortException)t).isSilent()) { 
+                if (((AbortException)t).isSilent()) {
                     t = null;
                     break;
                 }
@@ -615,7 +615,7 @@ public class Ajc10 extends MatchingTask {
                 } else {
                     Throwable tt = m.getThrown();
                     if (null != tt) {
-                        t = tt;   
+                        t = tt;
                     } else {
                         break;
                     }
@@ -631,9 +631,9 @@ public class Ajc10 extends MatchingTask {
 //        	if (0 < holder.numMessages(level, true)) {
 //        		final String prefix = "";
 //        		final boolean printSummary = false;
-//        		MessageUtil.print(System.err, 
-//        			holder, 
-//        			prefix, 
+//        		MessageUtil.print(System.err,
+//        			holder,
+//        			prefix,
 //        			MessageUtil.MESSAGE_ALL,
 //        			(verbose ? MessageUtil.PICK_INFO_PLUS : MessageUtil.PICK_WARNING_PLUS),
 //        			printSummary);
diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
index 463c24325..d89fee5f5 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2003 Contributors.
  * All rights reserved.
  * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     Wes Isberg     initial implementation
@@ -34,7 +34,7 @@ import java.io.File;
  * set the global property CLEAN ("build.compiler.clean") to delete
  * all .class files in the destination directory before compiling.
  * </p>
- * 
+ *
  * <p><u>Warnings</u>:</p>
  * <ol>
  * <li>cleaning will not work if no destination directory
@@ -48,15 +48,15 @@ import java.io.File;
  *     and thus cannot gain control to clean out the destination dir.
  *     </li>
  * </ol>
- * 
+ *
  * @author Wes Isberg
  * @since AspectJ 1.1, Ant 1.5.1
  */
 public class Ajc11CompilerAdapter implements CompilerAdapter {
 
-    /** 
-     * Define this system/project property to signal that the 
-     * destination directory should be cleaned 
+    /**
+     * Define this system/project property to signal that the
+     * destination directory should be cleaned
      * and javac reinvoked
      * to get the complete list of files every time.
      */
@@ -104,7 +104,7 @@ public class Ajc11CompilerAdapter implements CompilerAdapter {
     }
 
     /**
-     * If destDir exists and property CLEAN is set, 
+     * If destDir exists and property CLEAN is set,
      * this cleans out the dest dir of any .class files,
      * and returns true to signal a recursive call.
      * @return true if destDir was cleaned.
diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java
index 90f5707ea..4c3bb93ea 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
- * Copyright (c) 2000-2001 Xerox Corporation. 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * Copyright (c) 2000-2001 Xerox Corporation.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -43,7 +43,7 @@ public class Ajc2 extends Javac {
      * Attribute members
      * ----------------------------------------------------------------------
      */
-   
+
     /**
      * How many concurrent threads to use for compilation,
      * defaults to 0 -- multi-threading disabled.
@@ -113,7 +113,7 @@ public class Ajc2 extends Javac {
      * Attribute access methods
      * ----------------------------------------------------------------------
      */
-    
+
     /**
      * Sets the number of threads.
      *
@@ -169,7 +169,7 @@ public class Ajc2 extends Javac {
      *
      * @return <code>true</code> if the <code>-nosymbols</code> flag is on.
      * @see    Ajc2#nosymbols
-     */    
+     */
     public boolean getNosymbols() {
         return nosymbols;
     }
@@ -189,7 +189,7 @@ public class Ajc2 extends Javac {
      *
      * @return <code>true</code> if the <code>-preprocess</code> flag is on.
      * @see    Ajc2#preprocess
-     */      
+     */
     public boolean getPreprocess() {
         return preprocess;
     }
@@ -301,7 +301,7 @@ public class Ajc2 extends Javac {
      *
      * @return new PatternSet.NameEntry to be added to the exclude list.
      * @see    org.apache.tools.ant.taskdefs.Javac#createExclude()
-     */    
+     */
     public PatternSet.NameEntry createExclude() {
         haveExcludes = true;
         return super.createExclude();
@@ -325,7 +325,7 @@ public class Ajc2 extends Javac {
      *
      * @param excludes Comma-separated list of excludes.
      * @see   org.apache.tools.ant.taskdefs.Javac#setExcludes(java.lang.String)
-     */    
+     */
     public void setExcludes(String excludes) {
         haveExcludes = true;
         super.setExcludes(excludes);
@@ -334,7 +334,7 @@ public class Ajc2 extends Javac {
     public String getAdapterClass() {
         return ADAPTER_CLASS;
     }
-    
+
 
     public final void execute() throws BuildException {
         prepare();
@@ -347,9 +347,9 @@ public class Ajc2 extends Javac {
      *
      * @throws org.apache.tools.ant.BuildException
      * @see    org.apache.tools.ant.taskdefs.Javac#execute()
-     */    
+     */
     public void executeAfterPrepare() throws BuildException {
-        
+
         // Save the old build.compiler property
         String oldBuildCompiler = project.getProperty("build.compiler");
 
@@ -375,7 +375,7 @@ public class Ajc2 extends Javac {
         } catch (BuildException be) {
             caught = be;
         } finally {
-            
+
             // Reset to the old compiler
             if (oldBuildCompiler != null) {
                 project.setProperty("build.compiler", oldBuildCompiler);
@@ -460,7 +460,7 @@ public class Ajc2 extends Javac {
     private void expandArgfile(File argfile, List includes, List arguments) {
 
         log("argfile:" + argfile, Project.MSG_VERBOSE);
-        
+
         // All paths are relative to the parent
         File parent = argfile.getParentFile();
 
diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java
index a0c84d2db..0b650a60f 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
- * Copyright (c) 2000-2001 Xerox Corporation. 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * Copyright (c) 2000-2001 Xerox Corporation.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -23,9 +23,9 @@ import java.io.File;
 /**
  * Partial implementation of CompilerAdapter for ajc task.
  * The Javac interface does not support argfiles which are
- * typically necessary to compile under ajc, so this 
+ * typically necessary to compile under ajc, so this
  * implementation is not documented, recommended, or supported.
- * See Apache request for enhancement 
+ * See Apache request for enhancement
  * <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7542">
  * 7542</a>.
  * @see CompilerAdapter
@@ -40,7 +40,7 @@ public class AjcCompilerAdapter implements CompilerAdapter {
         if (null == javac) {
             throw new IllegalArgumentException("null javac");
         }
-        Object task = javac.getProject().createTask("ajc"); 
+        Object task = javac.getProject().createTask("ajc");
         String err = null;
         if (null == task) {
             err = "ajc not defined - put ajc taskdef library on classpath";
@@ -86,7 +86,7 @@ public class AjcCompilerAdapter implements CompilerAdapter {
         tempAjc.setDebug(javac.getDebug()); // XXX unsupported
         tempAjc.setOptimize(javac.getOptimize()); // XXX unsupported
         tempAjc.setDepend(javac.getDepend()?"on":"off"); // XXX unsupported
-        tempAjc.setVerbose(javac.getVerbose()); 
+        tempAjc.setVerbose(javac.getVerbose());
         String target = javac.getTarget();
         if (null != target) {
             tempAjc.setTarget(target);
@@ -101,9 +101,9 @@ public class AjcCompilerAdapter implements CompilerAdapter {
         ajc = tempAjc;
     }
 
-    /** 
+    /**
      * Run the compiler.
-     * @see CompilerAdapter#execute() 
+     * @see CompilerAdapter#execute()
      * @throws BuildException if setJavac(Javac) was not called before each call of this
      */
     public boolean execute() throws BuildException {
diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
index a4415833a..218fc56d5 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -4,9 +4,9 @@
  *               2003-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:
  *     Xerox/PARC     initial implementation
diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajdoc.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajdoc.java
index 24293d506..c26c13309 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajdoc.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajdoc.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2000-2001 Xerox Corporation.
  * All rights reserved.
  * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     Xerox/PARC     initial implementation
diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/ICommandEditor.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/ICommandEditor.java
index 2010f7a95..136c3c66d 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/ICommandEditor.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/ICommandEditor.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2003 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Wes Isberg     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -20,7 +20,7 @@ public interface ICommandEditor {
     /**
      * Edit command being used.
      * @param command the String[] to edit
-     * @return String[] input command if unchanged, 
+     * @return String[] input command if unchanged,
      *         or new non-null array of non-null components otherwise
      */
     String[] editCommand(String[] command);
diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
index fe6900755..db9687ed1 100644
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
- * Copyright (c) 2000-2001 Xerox Corporation. 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * Copyright (c) 2000-2001 Xerox Corporation.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs.compilers;
@@ -41,14 +41,14 @@ public class Ajc extends DefaultCompilerAdapter {
 
     /** The name of the compiler's main class. */
     private final static String MAIN_CLASS_NAME = "org.aspectj.tools.ajc.Main";
-    
+
     /**
      * List of arguments allowed only by javac and <b>not</b> ajc.
-     */    
+     */
     final static List<String> javacOnlyFlags
         = finalList(new String[] { "-g:none", "-g:lines",
         "-g:vars", "-g:source", "-nowarn"});
-    final static List<String> javacOnlyArgs  
+    final static List<String> javacOnlyArgs
         = finalList(new String[] { "-sourcepath",
         "-encoding", "-target" });
 
@@ -108,7 +108,7 @@ public class Ajc extends DefaultCompilerAdapter {
         }
     }
 
-    
+
     /**
      * Removes unsupported arguments from <code>cline</code>
      * issuing warnings for each using <code>log</code>.
@@ -139,7 +139,7 @@ public class Ajc extends DefaultCompilerAdapter {
         }
         return (String[])argsList.toArray(new String[0]);
     }
-    
+
     /**
      * Adds arguments that setupJavacCommand() doesn't pick up.
      *
@@ -151,7 +151,7 @@ public class Ajc extends DefaultCompilerAdapter {
      */
     private Commandline addAjcOptions(Commandline cline) throws BuildException {
         Javac javac = getJavac();
-                               
+
         org.aspectj.tools.ant.taskdefs.Ajc2 ajc = null;
 
         try {
@@ -159,7 +159,7 @@ public class Ajc extends DefaultCompilerAdapter {
         } catch (ClassCastException cce) {
             throw new BuildException(cce+"");
         }
-        
+
         if (ajc.getThreads() != null) {
             cline.createArgument().setValue("-threads");
             cline.createArgument().setValue(ajc.getThreads() + "");
@@ -182,7 +182,7 @@ public class Ajc extends DefaultCompilerAdapter {
     }
 
     /**
-     * Logs the compilation parameters, adds the files to compile and logs the 
+     * Logs the compilation parameters, adds the files to compile and logs the
      * &quot;niceSourceList&quot;
      */
     @Override
@@ -215,5 +215,5 @@ public class Ajc extends DefaultCompilerAdapter {
 			niceSourceList.append("   " + arg + rest + lSep);
 		}
         attributes.log(niceSourceList.toString(), Project.MSG_VERBOSE);
-    }    
+    }
 }
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
index 3a5f3b954..42762fc17 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
- * Copyright (c) 2003 Contributors. 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
+ * Copyright (c) 2003 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Wes Isberg     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -25,16 +25,16 @@ import java.util.List;
 import junit.framework.TestCase;
 
 /**
- * 
+ *
  */
 public class Ajc11CompilerAdapterTest extends TestCase {
     public static boolean LOGGING = false;
     List tempFiles = new ArrayList();
-    
+
     public Ajc11CompilerAdapterTest(String name) {
         super(name);
     }
-    
+
     public void tearDown() {
 		for (Object tempFile : tempFiles) {
 			File file = (File) tempFile;
@@ -42,14 +42,14 @@ public class Ajc11CompilerAdapterTest extends TestCase {
 			file.delete();
 		}
     }
-    
-//    public void testCompilerAdapterWithJavac() { // XXX requires tools.jar 
+
+//    public void testCompilerAdapterWithJavac() { // XXX requires tools.jar
 //        Javac javac = getJavac(new Project());
 //        setupTracingJava(javac);
 //        javac.execute();
 //    }
 
-    public void testCompilerAdapterWithAjc() { // XXX unverified        
+    public void testCompilerAdapterWithAjc() { // XXX unverified
         Project project = new Project();
         String cname = Ajc11CompilerAdapter.class.getName();
         project.setProperty("build.compiler", cname);
@@ -59,7 +59,7 @@ public class Ajc11CompilerAdapterTest extends TestCase {
         System.out.flush();
         javac.execute();
         log("---- second compile (none: nothing out of date?)...");
-        javac.execute(); 
+        javac.execute();
     }
 
     public void testCompilerAdapterWithAjcRecursively() { // XXX unverified
@@ -90,9 +90,9 @@ public class Ajc11CompilerAdapterTest extends TestCase {
         javac.setClasspath(new Path(project, rt.getAbsolutePath()));
         return javac;
     }
-    
+
     void setupTracingJava(Javac javac) { // XXX assumes module dir, doc loc
-        String exDir = "../docs/dist/doc/examples"; 
+        String exDir = "../docs/dist/doc/examples";
         javac.setSrcdir(new Path(javac.getProject(), exDir));
         javac.setIncludes("tracing/*.java"); // XXX assumes tracing example
     }
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
index e6ae8876b..0281d66d4 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
@@ -5,9 +5,9 @@
  *               2005 Contributors
  * All rights reserved.
  * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     Xerox/PARC     initial implementation
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
index 4527c6c9f..9a913f710 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.tools.ant.taskdefs;
@@ -21,7 +21,7 @@ import java.io.File;
 import junit.framework.TestCase;
 
 /**
- * 
+ *
  */
 public class AjdocTest extends TestCase {
 
@@ -43,7 +43,7 @@ public class AjdocTest extends TestCase {
         task.setClasspath(new Path(p, "../lib/test/aspectjrt.jar"));
         task.execute();
     }
-    
+
     public void testHelp() {
         Ajdoc task = new Ajdoc();
         Project p = new Project();
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java
index 99a21d4c1..840b76270 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsModuleTests.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 package org.aspectj.tools.ant.taskdefs;
 
@@ -16,13 +16,13 @@ import junit.framework.*;
 
 public class TaskdefsModuleTests extends TestCase {
 
-    public static TestSuite suite() { 
+    public static TestSuite suite() {
         TestSuite suite = new TestSuite(TaskdefsModuleTests.class.getName());
-        suite.addTestSuite(Ajc11CompilerAdapterTest.class); 
-        suite.addTestSuite(AjdocTest.class); 
-        suite.addTestSuite(AjcTaskTest.class); 
+        suite.addTestSuite(Ajc11CompilerAdapterTest.class);
+        suite.addTestSuite(AjdocTest.class);
+        suite.addTestSuite(AjcTaskTest.class);
         return suite;
     }
 
     public TaskdefsModuleTests(String name) { super(name); }
-}  
+}