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>

3 files changed, 101 insertions, 101 deletions

diff --git a/build/release/aspectj-cc.xml b/build/release/aspectj-cc.xml
index 9b6c8bede..79f13ec8f 100644
--- a/build/release/aspectj-cc.xml
+++ b/build/release/aspectj-cc.xml
@@ -3,27 +3,27 @@
 <!-- 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://www.eclipse.org/legal/epl-v10.html                                 -->
+<!-- https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt                 -->
 <!--                                                                           -->
 <!-- Contributors: (See CVS checkins)                                          -->
 <!-- ========================================================================= -->
 <project name="aspectj-cc" basedir="." default="all">
-	
+
 	<target name="all" depends="init">
 		<antcall target="cvs-update"/>
 		<aspectj-build target="all"/>
 		<antcall target="cc-complete"/>
-	</target>	
-	
+	</target>
+
     <target name="cvs-update" depends="init"
 		description="update AspectJ source tree">
 		<cvs cvsroot="${cvs.root}"
 		          dest="${aspectj.modules.rdir}"
-		       package="${cvs.module}" 
-		         quiet="on" 
-		   failonerror="on" 
+		       package="${cvs.module}"
+		         quiet="on"
+		   failonerror="on"
 		       command="update -dP" />
 	</target>
 
@@ -31,7 +31,7 @@
 		description="post-process cruise control build">
 		<!-- see ${aj.build.dir}/failures.txt -->
 	</target>
-    	
+
 	<target name="create-cc-properties">
 		<propertyfile file="created-aspectj-cc.properties"
 			comment="Rename to aspectj-cc.properties, put with aspectj-cc script">
@@ -54,55 +54,55 @@
 	</target>
 
     <target name="init" depends="init-properties"/>
-    
+
 	<target name="init-properties">
 		<property file="${basedir}/aspectj-cc.properties" />
 		<property name="aspectj.build.dir"
-			location="${basedir}/${aspectj.modules.rdir}/build"/>		
+			location="${basedir}/${aspectj.modules.rdir}/build"/>
 		<property name="local.properties"
-			location="${aspectj.build.dir}/local.properties"/>		
+			location="${aspectj.build.dir}/local.properties"/>
 	</target>
-    
+
 	<target name="check-local-properties">
 		<condition property="local.properties.empty" value="true">
-			<length file="${local.properties}" 
+			<length file="${local.properties}"
 				when="equal" length="0"/>
 		</condition>
 		<antcall target="do-write-local-properties"/>
     </target>
-    
+
 	<target name="do-write-local-properties" depends="init"
 		if="local.properties.empty"
 		unless="do-write-local-properties.done">
 		<propertyfile file="${local.properties}">
-			<entry key="build.version" value="${build.version}"/> 
-			<entry key="build.version.base" value="${build.version.base}"/> 
-			<entry key="build.version.long" value="${build.version.long}"/> 
-			<entry key="build.version.short" value="${build.version.short}"/> 
-			<entry key="java.13" value="${java.13}"/> 
-			<entry key="java.14" value="${java.14}"/> 
-			<entry key="java.15" value="${java.15}"/> 
+			<entry key="build.version" value="${build.version}"/>
+			<entry key="build.version.base" value="${build.version.base}"/>
+			<entry key="build.version.long" value="${build.version.long}"/>
+			<entry key="build.version.short" value="${build.version.short}"/>
+			<entry key="java.13" value="${java.13}"/>
+			<entry key="java.14" value="${java.14}"/>
+			<entry key="java.15" value="${java.15}"/>
 		</propertyfile>
 		<property name="do-write-local-properties.done" value="true"/>
     </target>
-			
+
 	<macrodef name="aspectj-build">
 	    <attribute name="target"/>
 	    <sequential>
 			<antcall target="check-local-properties"/>
 			<fail message="did not find local.properties=${local.properties}">
 				<condition>
-					<length file="${local.properties}" 
+					<length file="${local.properties}"
 						when="equal" length="0"/>
 				</condition>
 			</fail>
 			<ant
 				antfile="release/build.xml"
 				target="@{target}"
-				dir="${basedir}/${aspectj.modules.rdir}/build" 
+				dir="${basedir}/${aspectj.modules.rdir}/build"
 				inheritAll="false"
 				/>
 	    </sequential>
     </macrodef>
-		    
+
 </project>
diff --git a/build/release/build.xml b/build/release/build.xml
index 43196f63f..52ec9e770 100644
--- a/build/release/build.xml
+++ b/build/release/build.xml
@@ -2,9 +2,9 @@
 <!-- Copyright (c) 2003-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:                                                             -->
 <!--     Wes Isberg     initial implementation                                 -->
@@ -13,23 +13,23 @@
 <project name="build" default="all" basedir="..">
 
     <property name="aspectj.modules.dir" location="${basedir}/.."/>
-    
+
     <import file="${aspectj.modules.dir}/build/build-properties.xml"/>
     <import file="${aspectj.modules.dir}/build/release/release-tests.xml"/>
 
 	<target name="info">
 	    <echo message="see build.readme.txt and readme.txt"/>
 	</target>
-	
+
     <target name="init" depends="init-release-properties">
 	</target>
-    
+
 	<target name="init-release-properties" depends="init-properties,init-directories">
 		<property name="do.cvs" value="false"/>
 	    <property name="run.${min.vm}" value="true"/>
 	    <property name="run.14" value="false"/>
 	    <property name="run.${max.vm}" value="true"/>
-		
+
 		<property name="aspectj.build.props" value=""/>
 		<property name="ant.verbose" value=""/>
 		<property name="failonerror" value="false"/>
@@ -42,7 +42,7 @@
 
 		<property name="harness.jar"
 			location="${aj.jar.dir}/testing-drivers-test-all.jar"/>
-		
+
 		<property name="java.home.file"
 			location="${aj.build.dir}/javahome.props.tmp"/>
 
@@ -51,13 +51,13 @@
 
 		<property name="java14.command"
 			location="${java14.home}/bin/java"/>
-		
+
 		<property name="java15.command"
 			location="${java15.home}/bin/java"/>
 
         <mkdir dir="${aj.logs.dir}"/>
 	</target>
-	
+
 	<target name="all" depends="init">
 	    <build-aspectj vm="${min.vm}" target="clean"/>
 	    <save-build-id id="min-vm-${min.vm}"/>
@@ -66,11 +66,11 @@
 	    <!-- ANDY removed... build-aspectj vm="${min.vm}" target="test-each-module"/-->
 		<build-aspectj vm="${max.vm}" target="junitreport"/>
 		<build-aspectj vm="${max.vm}" target="save-result"/>
-	    
+
 	    <build-aspectj vm="${max.vm}" target="clean-keep-results"/>
 	    <!-- can't use safety of build-aspectj since deleting output file -->
 		<antcall target="clean-default-results"/>
-		
+
 	    <save-build-id id="max-vm-${max.vm}"/>
 		<build-aspectj vm="${max.vm}" target="echo-properties"/>
 	    <build-aspectj vm="${max.vm}" target="all"/>
@@ -78,15 +78,15 @@
 		<build-aspectj vm="${max.vm}" target="junitreport"/>
 		<antcall target="install"/>
 		<antcall target="product-tests"/>
-		<!-- TODO re-enable antcall target="harness-tests"/ --> 
+		<!-- TODO re-enable antcall target="harness-tests"/ -->
 		<!-- Temporary removal to see if build will work... -->
 		<!--build-aspectj vm="13" target="compile-runtime-11"/-->
-			
+
 	    <build-aspectj vm="${max.vm}" target="save-result"/>
-	    
+
 		<antcall target="fail-if-allresults-allfailures"/>
 	</target>
-          
+
 	<target name="install" depends="init-release-properties"
 		description="install AspectJ distribution using Java min.vm=${min.vm}">
 	    <antcall target="init-postBuild-properties"/>
@@ -95,17 +95,17 @@
 		<clean-dir dir="${aj.install.dir}"/>
 		<setup-vm vm="${min.vm}"/>
 		<property file="${java.home.file}"/>
-		<fail unless="build.java.command" 
+		<fail unless="build.java.command"
 		     message="failed to read ${build.java.command} from ${java.home.file}"/>
-	    <java 
-		    fork="true" 
+	    <java
+		    fork="true"
 			jvm="${build.java.command}"
-			jar="${aspectj.jar}" 
+			jar="${aspectj.jar}"
 		    failonerror="true">
 			<arg line="-to ${aj.install.dir}"/>
 		</java>
 	</target>
-    
+
     <macrodef name="build-aspectj">
 	    <attribute name="target"/>
 	    <attribute name="vm"/>
@@ -114,20 +114,20 @@
 	        <condition property="do.ant.props" value=" ">
 	            <not><isset property="do.ant.props"/></not>
 	        </condition>
-	        	
+
 			<antcall target="do-run-ant">
 				<param name="verbose" value="true"/>
 				<param name="ant.dir" location="${aspectj.modules.build.dir}"/>
 				<param name="run.ant.file" value="build.xml"/>
 				<param name="ant.target" value="@{target}"/>
-				<param name="ant.output" 
+				<param name="ant.output"
 					location="${aj.logs.dir}/build-@{target}"/>
-				<param name="ant.properties" 
+				<param name="ant.properties"
 				    value="${do.ant.props} ${aspectj.build.props}"/>
 			</antcall>
 		</sequential>
     </macrodef>
-    
+
 	<target name="do-run-ant" depends="init-release-properties"
 	 description="the ant we use to build">
 		<!-- we could use normal ant, but we enforce using
@@ -139,17 +139,17 @@
 		<property name="ant.properties" value=""/>
 
 		<property file="${java.home.file}"/>
-		<fail unless="build.java.home" 
+		<fail unless="build.java.home"
 		     message="failed to read ${build.java.home} from ${java.home.file}"/>
-		<fail unless="build.java.version" 
+		<fail unless="build.java.version"
 		     message="failed to read ${build.java.version} from ${java.home.file}"/>
-		<available property="aspectjrt.path" 
+		<available property="aspectjrt.path"
 			value="${aj.install.dir}/lib/aspectjrt.jar"
 			file="${aj.install.dir}/lib/aspectjrt.jar"/>
 		<available property="aspectjrt.path"
-			value="${lib.test.aspectjrt.jar}" 
+			value="${lib.test.aspectjrt.jar}"
 			file="${lib.test.aspectjrt.jar}"/>
-		<property name="ant.output.file" 
+		<property name="ant.output.file"
 			location="${ant.output}-${build.java.version}.txt"/>
 		<echo>
   do-run-ant dir ${ant.dir}
@@ -160,7 +160,7 @@
   aspectjrt.path ${aspectjrt.path}
 </echo>
 
-		<java 
+		<java
 			fork="true"
 			resultproperty="do-run-ant.result"
 			failonerror="${failonerror}"
@@ -176,13 +176,13 @@
 					<include name="*.jar"/>
 				</fileset>
 				<pathelement location="${junit.jar}"/>
-				<pathelement location="${build.java.home}/lib/tools.jar"/> 
+				<pathelement location="${build.java.home}/lib/tools.jar"/>
 			</classpath>
 
 			<!-- urk - all properties for any client -->
 			<!-- for any build -->
 			<sysproperty key="JAVA_HOME" path="${build.java.home}"/>
-			<sysproperty key="ANT_HOME" 
+			<sysproperty key="ANT_HOME"
 				path="${aspectj.ant.home}"/>
 
 			<!-- for ajde -->
@@ -196,16 +196,16 @@
 			<arg line="-f ${run.ant.file} ${ant.target} ${ant.verbose} ${ant.properties}"/>
 		</java>
 		<condition property="do-run-ant.failed" value="true">
-			<not><equals arg1="0" arg2="${do-run-ant.result}"/></not>			
+			<not><equals arg1="0" arg2="${do-run-ant.result}"/></not>
 		</condition>
 		<echo message="dra: do-run-ant.failed=${do-run-ant.failed} do-run-ant.result=${do-run-ant.result}"/>
 		<report-if-failed property="do-run-ant.failed"
 			text="Build failed: ${ant.output.file}"/>
 	</target>
-    
+
     <macrodef name="do-vm-targets">
         <attribute name="target"/>
-        <sequential>            
+        <sequential>
 			<do-vm-target target="@{target}" vm="min" />
 			<do-vm-target target="@{target}" vm="14" />
 	 		<do-vm-target target="@{target}" vm="max" />
@@ -220,7 +220,7 @@
             </antcall>
 	    </sequential>
 	</macrodef>
-    
+
 	<target name="do-13-target"	if="run.13">
 		<setup-vm vm="13"/>
 		<antcall target="${do.target}"/>
@@ -235,7 +235,7 @@
 		<setup-vm vm="15"/>
 		<antcall target="${do.target}"/>
 	</target>
-	
+
 	<target name="do-min-target"	if="run.${min.vm}">
 		<setup-vm vm="${min.vm}"/>
 		<antcall target="${do.target}"/>
@@ -247,7 +247,7 @@
 	</target>
     <macrodef name="setup-vm">
         <attribute name="vm"/>
-        <sequential>            
+        <sequential>
 			<property name="wjf@{vm}.bjh" location="${java@{vm}.home}"/>
 			<property name="wjf@{vm}.cmd" location="${wjf@{vm}.bjh}/bin/java"/>
             <delete file="${java.home.file}"/>
@@ -259,4 +259,4 @@
         </sequential>
 	</macrodef>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/build/release/release-tests.xml b/build/release/release-tests.xml
index 3caf9eaeb..6e2a334a4 100644
--- a/build/release/release-tests.xml
+++ b/build/release/release-tests.xml
@@ -2,25 +2,25 @@
 <!-- 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://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                                 -->
 <!-- ========================================================================= -->
 <project name="release-tests" default="product-tests">
-				
+
 	<target name="product-tests" unless="skip.test"
 		description="run product tests">
 		<do-vm-targets target="test-build-examples"/>
 	</target>
-			
+
 	<target name="init-postBuild-properties" depends="init-release-properties">
 		<require-available property="aspectj.jar"
-			path="${aj.dist.dir}/aspectj-${build.version}.jar"/>			
+			path="${aj.dist.dir}/aspectj-${build.version}.jar"/>
     </target>
-	
+
 	<target name="init-sources-available" depends="init-release-properties"
 		unless="sources.available">
 		<available property="sources.available"
@@ -32,7 +32,7 @@
 		unless="aspectj.available">
 		<available property="aspectj.available"
 			file="${aj.install.dir}" type="dir"/>
-		<fail unless="aspectj.available" 
+		<fail unless="aspectj.available"
 			message="install first in ${aj.install.dir}"/>
 	</target>
 
@@ -41,11 +41,11 @@
 		<available property="harness.available"
 			classname="org.aspectj.testing.drivers.Harness"
 			classpath="${harness.jar}"/>
-		<fail unless="harness.available" 
+		<fail unless="harness.available"
 			message="harness not found - first build-testing"/>
 	</target>
-	
-	<target name="test-build-examples" 
+
+	<target name="test-build-examples"
 		depends="init-postBuild-properties,init-aspectj-available">
 		<run-example name="bean"/>
 		<run-example name="intro"/>
@@ -63,21 +63,21 @@
 		<run-example name="nonGui"/>
 		<echo message="TODO: setup and run compiler adapter example"/>
 	</target>
-	
+
 	<target name="do-run-harness" depends="init-postBuild-properties,init-harness-available">
 		<fail unless="suite.filename" message="define suite.filename"/>
 		<fail unless="harness.args" message="define harness.args"/>
 		<fail unless="harness.suffix" message="define harness.suffix"/>
-		
+
 		<property name="drho.default.options"
 			value="-release -logFail -killTemp"/>
-		
+
 		<property file="${java.home.file}"/>
 		<fail unless="build.java.home"
 			message="failed to read ${build.java.home} from ${java.home.file}"/>
 		<fail unless="build.java.version"
 			message="failed to read ${build.java.version} from ${java.home.file}"/>
-		
+
 		<property name="harness.output.file"
 			location="${aj.logs.dir}/test-${suite.filename}${harness.suffix}-${build.java.version}.txt"/>
 		<echo> do-run-harness ${suite.filename}.xml with options
@@ -91,18 +91,18 @@
 			<arg line="${drho.default.options} ${harness.args}"/>
 		</java>
 	</target>
-	
+
 	<macrodef name="run-example">
 		<attribute name="name"/>
 		<sequential>
-			
+
 		<antcall target="init"/>
 		<antcall target="do-run-ant">
-			<param name="ant.dir" 
+			<param name="ant.dir"
 				location="${aj.install.dir}/doc/examples"/>
 			<param name="run.ant.file" value="build.xml"/>
 			<param name="ant.target" value="@{name}"/>
-			<param name="ant.output" 
+			<param name="ant.output"
 				location="${aj.logs.dir}/test-example-@{name}"/>
 			<param name="ant.properties" value=""/>
 			<!-- XXX getting OOMemory - permit and investigate -->
@@ -110,20 +110,20 @@
 		</antcall>
 		</sequential>
 	</macrodef>
-	
-	<target name="test-ajc-aspectj" 
+
+	<target name="test-ajc-aspectj"
 		depends="init-postBuild-properties,init-aspectj-available,init-sources-available">
 		<antcall target="do-run-ant">
-			<param name="ant.dir" 
+			<param name="ant.dir"
 				location="${aspectj.modules.dir}/tests/product/build-aspectj"/>
 			<param name="run.ant.file" value="build.xml"/>
 			<param name="ant.target" value=""/>
-			<param name="ant.output" 
+			<param name="ant.output"
 				location="${aj.logs.dir}/test-ajc-aspectj"/>
 		</antcall>
 		<delete quiet="on" dir="${aspectj.modules.dir}/tests/product/build-aspectj/output"/>
 	</target>
-	
+
 	<!-- ====                                        source tests ==== -->
 	<target name="test-sources">
 		<do-vm-targets target="do-test-sources-sequence"/>
@@ -134,12 +134,12 @@
 		<antcall target="test-junit-modules"/>
 	</target>
 
-	<target name="test-doc-links" 
+	<target name="test-doc-links"
 		depends="init-aspectj-available,init-harness-available"
 		description="run link check against distribution">
 		<setup-vm vm="13"/>
 		<property file="${java.home.file}"/>
-		<fail unless="build.java.home" 
+		<fail unless="build.java.home"
 		     message="failed to read ${build.java.home} from ${java.home.file}"/>
 
 		<property name="doclink.output.file"
@@ -154,11 +154,11 @@
   - progguide/printable.html has harmless empty link to d0e26 (ajc-ref?)
 
 </echo>
-		<java 
+		<java
 			classname="org.aspectj.testing.util.LinkCheck"
 			fork="true"
 			dir="${aj.install.dir}"
-			classpath="${harness.jar}" 
+			classpath="${harness.jar}"
 			jvm="${build.java.command}"
 			output="${doclink.output.file}-out.txt">
 			<arg value="${doclink.start.file}"/>
@@ -169,7 +169,7 @@
 			<sysproperty key="http.proxyPort" value="${proxy.port}" />
 		</java>
 	</target>
-	
+
 	<target name="test-examples-11" depends="init-harness-available"
 		description="run examples under JDK 1.1">
 		<property name="j11.home"
@@ -182,7 +182,7 @@
 			<param name="suite.filename" value="ajcTestsExamples"/>
 			<param name="harness.args" value="-1.1"/>
 			<param name="harness.suffix" value="-run11"/>
-			<param name="harness.jvmline" 
+			<param name="harness.jvmline"
 				value="-Djavarun.fork=true -Djavarun.java=${java11.command} -Djavarun.java.home=${j11.home} -Djavarun.bootclasspath=${java11.classes.zip}"/>
 		</antcall>
 	</target>
@@ -194,10 +194,10 @@
         <build-aspectj vm="${max.vm}" target="build-testing-jars"/>
         <property name="build-testing.done" value="true"/>
 	</target>
-    
+
 	<target name="harness-tests" depends="build-testing">
 		<!-- we could use harness variants, e.g., "-emacssym-",
-		     but separating runs puts each variant in a different 
+		     but separating runs puts each variant in a different
 		     output file, which makes them easier to analyze.
 		-->
 		<antcall target="init-harness-available"/>
@@ -206,15 +206,15 @@
 			<param name="harness.args" value="-ajctestSkipKeywords=expect-fail"/>
 			<param name="harness.suffix" value="-pass"/>
 		</antcall>
-		
+
 		<antcall target="do-run-harness">
 			<param name="suite.filename" value="ajcTests"/>
 			<param name="harness.args" value=""/>
 			<param name="harness.suffix" value=""/>
 		</antcall>
 
-		<!-- 
-			skip variants for now 
+		<!--
+			skip variants for now
 		<antcall target="do-run-harness">
 			<param name="suite.filename" value="ajcTests"/>
 			<param name="harness.args" value="-emacssym"/>
@@ -248,5 +248,5 @@
 		</antcall>
 		-->
 	</target>
-				
-</project>
\ No newline at end of file
+
+</project>