You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2015/02/02 21:05:58 UTC

ant git commit: ensure hamcrest becomes part of the source distribution

Repository: ant
Updated Branches:
  refs/heads/master 66b5f3f06 -> e6a5e8299


ensure hamcrest becomes part of the source distribution


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e6a5e829
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e6a5e829
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e6a5e829

Branch: refs/heads/master
Commit: e6a5e829912bb7508b04cc4ad23016a1dc6e034a
Parents: 66b5f3f
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Feb 2 21:05:23 2015 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Feb 2 21:05:23 2015 +0100

----------------------------------------------------------------------
 build.xml                         |  1 +
 lib/optional/LICENSE.hamcrest.txt | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/e6a5e829/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 82b38be..159e88f 100644
--- a/build.xml
+++ b/build.xml
@@ -1104,6 +1104,7 @@
     <copy todir="${src.dist.lib}">
       <fileset dir="${lib.dir}">
         <include name="optional/junit*.jar"/>
+        <include name="optional/hamcrest*.jar"/>
         <include name="README"/>
         <include name="libraries.properties"/>
       </fileset>

http://git-wip-us.apache.org/repos/asf/ant/blob/e6a5e829/lib/optional/LICENSE.hamcrest.txt
----------------------------------------------------------------------
diff --git a/lib/optional/LICENSE.hamcrest.txt b/lib/optional/LICENSE.hamcrest.txt
new file mode 100644
index 0000000..4ccbb66
--- /dev/null
+++ b/lib/optional/LICENSE.hamcrest.txt
@@ -0,0 +1,17 @@
+[Hamcrest links to http://opensource.org/licenses/BSD-3-Clause from
+http://hamcrest.org/JavaHamcrest/ as its license, but doesn't state
+the copyright owner]
+
+Copyright (c) <YEAR>, <OWNER>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.