--- a/components/junit/junit.license Mon May 13 22:49:13 2013 -0700
+++ b/components/junit/junit.license Tue May 14 14:31:01 2013 -0700
@@ -1,3 +1,9 @@
+--------------
+- Junit 4.11 -
+--------------
+
+JUnit
+
Common Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
@@ -8,22 +14,21 @@
"Contribution" means:
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
+ a) in the case of the initial Contributor, the initial code and
+ documentation distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
-i) changes to the Program, and
+ i) changes to the Program, and
-ii) additions to the Program;
+ ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are
+ where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from a
Contributor if it was added to the Program by such Contributor itself or anyone
acting on such Contributor's behalf. Contributions do not include additions to
the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
+conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program.
"Contributor" means any person or entity that distributes the Program.
@@ -38,68 +43,70 @@
2. GRANT OF RIGHTS
-a) Subject to the terms of this Agreement, each Contributor hereby grants
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free copyright license to
reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses
-to its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
+ c) Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are provided by
+any Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license set
-forth in this Agreement.
+ d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement.
3. REQUIREMENTS
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
-a) it complies with the terms and conditions of this Agreement; and
+ a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
+ b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
+ i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for
+ ii) effectively excludes on behalf of all Contributors all liability for
damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
+damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
+ iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on or
-through a medium customarily used for software exchange.
+ iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange.
When the Program is made available in source code form:
-a) it must be made available under this Agreement; and
+ a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
+ b) a copy of this Agreement must be included with each copy of the
+Program.
Contributors may not remove or alter any copyright notices contained within the
Program.
@@ -125,10 +132,10 @@
offering. The obligations in this section do not apply to any claims or Losses
relating to any actual or alleged intellectual property infringement. In order
to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
For example, a Contributor might include the Program in a commercial product
offering, Product X. That Contributor is then a Commercial Contributor. If that
@@ -146,11 +153,11 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement, including but not limited to the risks and
+costs of program errors, compliance with applicable laws, damage to or loss of
+data, programs or equipment, and unavailability or interruption of operations.
6. DISCLAIMER OF LIABILITY
@@ -158,8 +165,8 @@
CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
7. GENERAL
@@ -172,13 +179,14 @@
If Recipient institutes patent litigation against a Contributor with respect to
a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
+lawsuit), then any patent licenses granted by that Contributor to such
+Recipient under this Agreement shall terminate as of the date such litigation
+is filed. In addition, if Recipient institutes patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient's patent(s), then such Recipient's rights
+granted under Section 2(b) shall terminate as of the date such litigation is
+filed.
All Recipient's rights under this Agreement shall terminate if it fails to
comply with any of the material terms or conditions of this Agreement and does
@@ -186,31 +194,32 @@
such noncompliance. If all Recipient's rights under this Agreement terminate,
Recipient agrees to cease use and distribution of the Program as soon as
reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
Everyone is permitted to copy and distribute copies of this Agreement, but in
order to avoid inconsistency the Agreement is copyrighted and may only be
modified in the following manner. The Agreement Steward reserves the right to
publish new versions (including revisions) of this Agreement from time to time.
No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
+IBM is the initial Agreement Steward. IBM may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
expressly, by implication, estoppel or otherwise. All rights in the Program not
expressly granted under this Agreement are reserved.
This Agreement is governed by the laws of the State of New York and the
intellectual property laws of the United States of America. No party to this
Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
+
--------------------------------------------------------------------------------
BSD License
--- a/components/junit/patches/build.xml.patch Mon May 13 22:49:13 2013 -0700
+++ b/components/junit/patches/build.xml.patch Tue May 14 14:31:01 2013 -0700
@@ -1,144 +1,11 @@
---- junit4.10/build.xml.~1~ 2011-09-29 14:20:56.000000000 -0700
-+++ junit4.10/build.xml 2012-04-10 16:50:13.369334597 -0700
-@@ -1,19 +1,19 @@
- <project name="junit" default="dist" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <tstamp />
-- <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-+
-
- <property file="${user.home}/.junit.properties" />
-- <property name="src" value="src/main/java" />
-+ <property name="src" value="src/main/" />
- <property name="target" location="target" />
- <property name="bin" location="${target}/main" />
- <property name="version-base" value="4.10" />
- <property name="version-status" value="" />
- <property name="version" value="${version-base}${version-status}" />
-- <property name="dist" value="junit${version}" />
-+ <property name="dist" value="dist" />
- <property name="versionfile" value="${src}/junit/runner/Version.java" />
- <property name="zipfile" value="${dist}/${dist}.zip" />
-- <property name="testsrc" location="src/test/java" />
-+ <property name="testsrc" location="src/test" />
- <property name="testbin" location="${target}/test/java" />
- <property name="unjarred"
- value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
-@@ -28,11 +28,18 @@
-
- <property name="javadocdir" location="${dist}/javadoc" />
- <property name="javadoczip" location="${dist}-javadoc.zip" />
-- <property name="hamcrestlib" location="lib/hamcrest-core-1.1.jar" />
-- <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
-+ <property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners, org.hamcrest.core, org.junit.matchers" />
-+ <property name="hamcrestsrc" location="temp.hamcrest.source" />
-
- <target name="init">
- <tstamp/>
-+ <unjar src="${srcjar}" dest="${src}" />
-+ <copy todir="${testsrc}/org">
-+ <fileset dir="org" />
-+ </copy>
-+ <copy todir="${testsrc}/junit">
-+ <fileset dir="junit" />
-+ </copy>
- </target>
-
- <target name="versiontag" depends="init">
-@@ -50,6 +57,8 @@
- <!-- If two builds are made within a minute -->
- <delete dir="${dist}" quiet="true" />
- <!-- Delete all previous temporary build artifacts -->
-+ <delete dir="${src}" quiet="true" />
-+ <delete dir="${testsrc}" quiet="true" />
- <delete dir="${target}" quiet="true" />
-
- <delete file="${zipfile}" quiet="true"/>
-@@ -76,12 +85,12 @@
- </macrodef>
-
- <target name="build" depends="versiontag">
-- <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/>
-- <unjar src="${hamcrestlib}" dest="${bin}" />
-- <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/>
-+ <junit_compilation srcdir="${hamcrestsrc}" destdir="${bin}" classpath=""/>
-+ <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${bin}"/>
-+ <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${bin}"/>
+# Disable this download of outside documentation.
+--- junit-r4.11/build.xml_orig 2012-11-13 12:10:08.000000000 -0800
++++ junit-r4.11/build.xml 2013-02-27 11:20:06.370285042 -0800
+@@ -152,7 +152,6 @@
+
+ <sourcepath location="${src}" />
+ <sourcepath location="${hamcrestsrc}" />
+- <link href="http://java.sun.com/javase/6/docs/api/" />
+ </javadoc>
</target>
-- <target name="jars" depends="build">
-+ <target name="jars">
- <mkdir dir="${dist}" />
- <jar
- jarfile="${dist}/${srcjar}"
-@@ -121,40 +130,33 @@
-
- <target name="samples-and-tests">
- <copy todir="${dist}">
-- <fileset dir="${testbin}" />
-- <fileset dir="${testsrc}" />
-+ <fileset dir="${testsrc}" />
- </copy>
- </target>
-
-- <target name="unjar.hamcrest">
-- <unjar src="${hamcrestlib}" dest="${hamcrestsrc}" />
-- </target>
--
-+
- <target name="release-notes">
- <property name="basename" value="doc/ReleaseNotes${version-base}" />
-- <exec executable="build/Markdown.pl" failonerror="true">
-+ <exec executable="perl" failonerror="true">
-+ <arg file="../../Markdown.pl"/>
- <arg file="${basename}.txt"/>
- <redirector output="${basename}.html" />
- </exec>
- </target>
-
-- <target name="javadoc" depends="unjar.hamcrest">
-- <javadoc destdir="${javadocdir}"
-+ <target name="javadoc" >
-+ <javadoc packagenames="${javadocpackages}"
-+ destdir="${javadocdir}"
- author="false"
- version="false"
- use="false"
- windowtitle="JUnit API"
-- stylesheetfile="stylesheet.css"
-- >
-- <excludepackage name="junit.*" />
-- <excludepackage name="org.junit.internal.*" />
-- <excludepackage name="org.junit.experimental.theories.internal.*" />
--
-- <sourcepath location="${src}" />
-- <sourcepath location="${hamcrestsrc}" />
-- <link href="http://java.sun.com/javase/6/docs/api/" />
-- </javadoc>
-- </target>
-+ stylesheetfile="javadoc/stylesheet.css"
-+ >
-+ <sourcepath location="${src}" />
-+ <sourcepath location="${hamcrestsrc}" />
-+ </javadoc>
-+ </target>
-
- <target name="javadoczip">
- <delete file="${javadoczip}" />
-@@ -163,7 +165,7 @@
- </target>
-
- <target name="populate-dist"
-- depends="clean, build, jars, samples-and-tests, javadoc, release-notes"
-+ depends="clean, build, jars, samples-and-tests, javadoc"
- >
- <copy todir="${dist}/doc">
- <fileset dir="doc"/>
-@@ -171,7 +173,6 @@
- <copy file="README.html" tofile="${dist}/README.html" />
- <copy file="BUILDING" tofile="${dist}/BUILDING" />
- <copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
-- <copy file="build.xml" tofile="${dist}/build.xml" />
- </target>
-
- <macrodef name="run-tests">