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>

1 files changed, 43 insertions, 43 deletions

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java
index 8bc4ad814..1c4f1cb93 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.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.ajc121;
 
@@ -80,11 +80,11 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test014() {
   	runTest("NPE, Incorrect XLint:unmatchedSuperTypeInCall warning");
   }
-  
+
   public void test015_invalidXlint() { // keywords: "laurie hendren"
   	runTest("invalid warning indicating no match when a match really occurs");
   }
-  
+
   public void test016_ByteConversionInstructions() {
   	runTest("RuntimeException thrown: Could not find instruction: org.apache.bcel.generic.B2I");
   	String output = getLastRunResult().getStdErr();
@@ -100,35 +100,35 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   	assertTrue("Expected to find [s32767] in this output but didn't:"+output, output.contains("[s32767]"));
   	assertTrue("Expected to find [b0] in this output but didn't:"+output, output.contains("[b0]"));
   }
-  
+
   public void test017_PrivateMethodCallsInAroundAdvice() {
     runTest("Cannot advise private method call in around advice");
     System.err.println(getLastRunResult().getStdErr());
   }
-  
+
   public void test018_PrivateFieldSetsInAroundAdvice() {
     runTest("Cannot advise private field sets in around advice");
     System.err.println(getLastRunResult().getStdErr());
   }
-  
+
   public void test019_PrivateFieldGetsInAroundAdvice() {
     runTest("Cannot advise private field gets in around advice");
     System.err.println(getLastRunResult().getStdErr());
   }
-  
-// test takes over 5 minutes to run, so not included in normal suite run  
+
+// test takes over 5 minutes to run, so not included in normal suite run
 //  public void test020_branchTargetOffsetTooLargeForShort() {
 //      runTest("Branch target offset too large for short");
 //  }
-  
+
 //  public void test021_BcelFailureWithVeryLargeClasses() {
 //      runTest("Weaver fails in BCEL for large classes");
 //  }
-//  
+//
 //  public void test022_BcelFailureWithVeryLargeClasses_Binary() {
 //      runTest("Weaver fails in BCEL for large classes (binary)");
 //  }
-  
+
   public void test023_proceedInAround1() {
       runTest("proceed used as method name in around advice (1)");
   }
@@ -140,15 +140,15 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test025_proceedInAround3() {
       runTest("proceed used as method name in around advice (3)");
   }
-  
+
   public void test026_bindingThisAndTargetToTheSameFormal() {
   	runTest("ajc crashes when compiling the following program (binding this() and target())");
   }
-  
+
   public void test027_itdsOnInnerClassesAsStatic() {
       runTest("ITDs on inner classes should be static context");
   }
-  
+
   public void test028_itdsAndInitializers() {
     runTest("resolution of IT field inits");
   }
@@ -156,7 +156,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test029_falseInvalidAbsoluteTypeName() {
     runTest("Valid but inaccessible type names should not be flagged by XLint:invalidAbsoluteTypeName");
   }
-  
+
   public void test030_privateITDinitialisersBeingMatched() {
     runTest("intertype initialisers should match field set pointcuts");
   }
@@ -168,7 +168,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
     assertTrue("Expected output '"+exp+"' but got "+getLastRunResult().getStdErr(),
     		getLastRunResult().getStdErr().equals(exp));
   }
-  
+
   public void test032_stringConcatForDEOW() {
     runTest("Compile time declarations (warning and error) do not accept string concatenation (with +)");
   }
@@ -180,28 +180,28 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test034_scopeForITDS_pr61768() {
       runTest("scope for inter-type methods");
   }
-  
+
   public void test035_innerAspectCallsPrivateMethod_pr71372() {
     runTest("NoSuchMethodError calling private method from around advice in inner aspect");
     String s = getLastRunResult().getStdErr();
     assertTrue("Expected ':before:around' but got "+s,
     		   s.equals(":before:around"));
   }
-  
+
   public void test036_innerAspectCallsPrivateMethod_pr71372_2() {
     runTest("NoSuchMethodError calling private method from around advice in inner aspect (2)");
     String s = getLastRunResult().getStdErr();
     assertTrue("Expected ':before:around' but got "+s,
     		   s.equals(":before:around"));
   }
-  
+
   public void test037_innerAspectCallsPrivateMethod_pr71372_3() {
     runTest("NoSuchMethodError calling private method from around advice in inner aspect (3)");
     String s = getLastRunResult().getStdErr();
     assertTrue("Expected ':before:around' but got "+s,
     		   s.equals(":before:around"));
   }
-  
+
   public void test038_innerAspectCallsPrivateMethod_pr71372_4() {
     runTest("NoSuchMethodError calling private method from around advice in inner aspect (4)");
     String s = getLastRunResult().getStdErr();
@@ -212,19 +212,19 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test039_privilegedAspectAccessingPrivateMethods_pr67579() {
   	runTest("NPE on privileged aspect error");
   }
-  
+
   public void test040_privilegedAspectAccessingPrivateMethods_pr67579_2() {
   	runTest("NPE on privileged aspect error (2)");
   }
-  
+
   public void test041_ITDaccessingPrivateMethod_pr67578() {
   	runTest("Privileged Aspect Access Problem Across Packages");
   }
-  
+
   public void test042_ITDaccessingPrivateMethod_pr67578_2() {
   	runTest("Privileged Aspect Access Problem Across Packages (2)");
   }
-  
+
   public void test043_pr62642_ExceptionInInitializerError() {
     runTest("proper handling of ExceptionInIntializer inside clinit in presence of after throwing advice");
     String s = getLastRunResult().getStdErr();
@@ -234,15 +234,15 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 //    assertTrue("Output should contain 'CAUSE=org.aspectj.lang.NoAspectBoundException' but is '"+s+"'",
 //            s.indexOf("CAUSE=org.aspectj.lang.NoAspectBoundException")!=-1);
   }
-  
+
   public void test044_ITDnameClashes() {
     	runTest("ITD name clashes with private members");
   }
-  
+
   public void test045_ITDprotectedVisibility() {
   	runTest("Inconsistency in scoping of protected members in ITDs");
   }
-  
+
   public void test045_wrongLineForExecutionJoinPoint() {
   	runTest("wrong line for method execution join point");
   }
@@ -262,19 +262,19 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test049_interfaceITD_pr70794_4() {
     runTest("The introduction on interface causes the interface implementation class error (4)");
   }
-  
+
   public void test050_typePatternMatchingWithArrays() {
   	runTest("declare warning warns at wrong points");
   }
-  
+
   public void test052_bogusMessage1() {
     runTest("Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (1)");
   }
-  
+
   public void test053_bogusMessage2() {
     runTest("Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (2)");
   }
-  
+
   public void test054_cnfe() {
     runTest("passing null to array arguments confuzes static join point signature. (1)");
   }
@@ -282,11 +282,11 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test055_cnfe() {
     runTest("passing null to array arguments confuzes static join point signature. (2)");
   }
-  
+
   public void test056_arrayCloning() {
     runTest("around advice throws java.lang.VerifyError at runtime");
   }
-   
+
   public void test057_decSoftWithSuper() {
       runTest("declare soft can cause programs with invalid exception behaviour to be generated");
   }
@@ -294,23 +294,23 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test058_npeOnTJPerror() {
     runTest("NPE on thisJoinPoint mistake");
   }
-  
+
   public void test059_cflowOptimization_counters() {
   	runTest("Optimization of cflow - counters (1)");
   }
-  
+
   public void test060_cflowOptimization_counters() {
   	runTest("Optimization of cflow - shared counters (2)");
   }
-  
+
   public void test061_cflowOptimization_counters() {
   	runTest("Optimization of cflow - shared stacks (3)");
   }
-  
+
   public void test062_cflowOptimization_counters() {
   	runTest("Optimization of cflow - counters (4)");
   }
-   
+
   public void test063_cflowOptimization_countersWithAbstractPcuts() {
   	runTest("Optimization of cflow - counters with abstract pointcuts (5)");
   }
@@ -318,7 +318,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test064() {
   	runTest("Anonymous classes unaware of introductions into abstract classes");
   }
-  
+
   private int countLines(String s) {
     int lines = 0;
     int idx = 0;
@@ -328,7 +328,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
     }
     return lines;
   }
-  
+
   public void test065() {
   	runTest("before,after not (cflow(within(Trace*))) prints nothing");
   	String s = getLastRunResult().getStdErr();
@@ -338,4 +338,4 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	// IF YOU WANT TO SEE THE EXPECTED OUTPUT, LOOK IN THE TEST PROGRAM bugs/WhatsGoingOn.java
   }
 
-}
\ No newline at end of file
+}