Repository: tika
Updated Branches:
  refs/heads/2.x 5d9db6bec -> 8234b96fe


TIKA-2061 - Added Adobe BSD license to tika-xmp

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

Branch: refs/heads/2.x
Commit: 8234b96feee701b91265c27098df4f67921e78c5
Parents: 5d9db6b
Author: Bob Paulin <[email protected]>
Authored: Mon Aug 29 16:35:58 2016 -0500
Committer: Bob Paulin <[email protected]>
Committed: Mon Aug 29 16:35:58 2016 -0500

----------------------------------------------------------------------
 .../main/appended-resources/META-INF/LICENSE    | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/8234b96f/tika-xmp/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/tika-xmp/src/main/appended-resources/META-INF/LICENSE 
b/tika-xmp/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..75f1ba2
--- /dev/null
+++ b/tika-xmp/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,20 @@
+APACHE TIKA SUBCOMPONENTS
+
+Apache Tika includes a number of subcomponents with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+Adobe XMP Core - xmpcore
+The BSD License
+
+Copyright (c) 2009, Adobe Systems Incorporated  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this 
list of conditions and the following disclaimer.
+
+* 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.
+
+* Neither the name of Adobe Systems Incorporated, 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 MERCHANT ABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.

Reply via email to