From 01cdc012a066510dd564290747ac913e3188d8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Sat, 18 Aug 2012 01:47:40 +0000 Subject: [PATCH] SOLR-3707: Upgrade Solr to Tika 1.2 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1374501 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/eclipse/dot.classpath | 332 +++++++------ solr/CHANGES.txt | 10 +- solr/NOTICE.txt | 7 +- solr/contrib/extraction/ivy.xml | 32 +- .../ExtractingRequestHandlerTest.java | 21 +- .../apache-mime4j-core-0.7.2.jar.sha1 | 1 + solr/licenses/apache-mime4j-core-0.7.jar.sha1 | 1 - .../licenses/apache-mime4j-dom-0.7.2.jar.sha1 | 1 + solr/licenses/apache-mime4j-dom-0.7.jar.sha1 | 1 - solr/licenses/commons-compress-1.3.jar.sha1 | 1 - solr/licenses/commons-compress-1.4.1.jar.sha1 | 1 + solr/licenses/commons-compress-NOTICE.txt | 2 +- solr/licenses/fontbox-1.6.0.jar.sha1 | 1 - solr/licenses/fontbox-1.7.0.jar.sha1 | 1 + solr/licenses/fontbox-NOTICE.txt | 2 +- solr/licenses/isoparser-1.0-RC-1.jar.sha1 | 1 + ...L.txt => isoparser-1.0-RC-LICENSE-ASL.txt} | 0 ...NOTICE.txt => isoparser-1.0-RC-NOTICE.txt} | 5 +- solr/licenses/isoparser-1.0-beta-5.jar.sha1 | 1 - solr/licenses/javassist-3.6.0.GA.jar.sha1 | 1 - solr/licenses/jempbox-1.6.0.jar.sha1 | 1 - solr/licenses/jempbox-1.7.0.jar.sha1 | 1 + solr/licenses/jempbox-NOTICE.txt | 2 +- .../licenses/juniversalchardet-1.0.3.jar.sha1 | 1 + .../juniversalchardet-LICENSE-MPL.txt | 469 ++++++++++++++++++ solr/licenses/juniversalchardet-NOTICE.txt | 6 + solr/licenses/pdfbox-1.6.0.jar.sha1 | 1 - solr/licenses/pdfbox-1.7.0.jar.sha1 | 1 + solr/licenses/pdfbox-NOTICE.txt | 12 +- solr/licenses/poi-3.8-beta5.jar.sha1 | 1 - solr/licenses/poi-3.8.jar.sha1 | 1 + solr/licenses/poi-ooxml-3.8-beta5.jar.sha1 | 1 - solr/licenses/poi-ooxml-3.8.jar.sha1 | 1 + .../poi-ooxml-schemas-3.8-beta5.jar.sha1 | 1 - solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 | 1 + .../poi-scratchpad-3.8-beta5.jar.sha1 | 1 - solr/licenses/poi-scratchpad-3.8.jar.sha1 | 1 + solr/licenses/scannotation-1.0.2.jar.sha1 | 1 - solr/licenses/tika-core-1.1.jar.sha1 | 1 - solr/licenses/tika-core-1.2.jar.sha1 | 1 + solr/licenses/tika-core-NOTICE.txt | 13 +- solr/licenses/tika-parsers-1.1.jar.sha1 | 1 - solr/licenses/tika-parsers-1.2.jar.sha1 | 1 + solr/licenses/tika-parsers-NOTICE.txt | 11 +- solr/licenses/xz-1.0.jar.sha1 | 1 + solr/licenses/xz-LICENSE-PD.txt | 8 + solr/licenses/xz-NOTICE.txt | 8 + 47 files changed, 745 insertions(+), 225 deletions(-) create mode 100644 solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 delete mode 100644 solr/licenses/apache-mime4j-core-0.7.jar.sha1 create mode 100644 solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 delete mode 100644 solr/licenses/apache-mime4j-dom-0.7.jar.sha1 delete mode 100644 solr/licenses/commons-compress-1.3.jar.sha1 create mode 100644 solr/licenses/commons-compress-1.4.1.jar.sha1 delete mode 100644 solr/licenses/fontbox-1.6.0.jar.sha1 create mode 100644 solr/licenses/fontbox-1.7.0.jar.sha1 create mode 100644 solr/licenses/isoparser-1.0-RC-1.jar.sha1 rename solr/licenses/{isoparser-LICENSE-ASL.txt => isoparser-1.0-RC-LICENSE-ASL.txt} (100%) rename solr/licenses/{isoparser-NOTICE.txt => isoparser-1.0-RC-NOTICE.txt} (87%) delete mode 100644 solr/licenses/isoparser-1.0-beta-5.jar.sha1 delete mode 100644 solr/licenses/javassist-3.6.0.GA.jar.sha1 delete mode 100644 solr/licenses/jempbox-1.6.0.jar.sha1 create mode 100644 solr/licenses/jempbox-1.7.0.jar.sha1 create mode 100644 solr/licenses/juniversalchardet-1.0.3.jar.sha1 create mode 100644 solr/licenses/juniversalchardet-LICENSE-MPL.txt create mode 100644 solr/licenses/juniversalchardet-NOTICE.txt delete mode 100644 solr/licenses/pdfbox-1.6.0.jar.sha1 create mode 100644 solr/licenses/pdfbox-1.7.0.jar.sha1 delete mode 100644 solr/licenses/poi-3.8-beta5.jar.sha1 create mode 100644 solr/licenses/poi-3.8.jar.sha1 delete mode 100644 solr/licenses/poi-ooxml-3.8-beta5.jar.sha1 create mode 100644 solr/licenses/poi-ooxml-3.8.jar.sha1 delete mode 100644 solr/licenses/poi-ooxml-schemas-3.8-beta5.jar.sha1 create mode 100644 solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 delete mode 100644 solr/licenses/poi-scratchpad-3.8-beta5.jar.sha1 create mode 100644 solr/licenses/poi-scratchpad-3.8.jar.sha1 delete mode 100644 solr/licenses/scannotation-1.0.2.jar.sha1 delete mode 100644 solr/licenses/tika-core-1.1.jar.sha1 create mode 100644 solr/licenses/tika-core-1.2.jar.sha1 delete mode 100644 solr/licenses/tika-parsers-1.1.jar.sha1 create mode 100644 solr/licenses/tika-parsers-1.2.jar.sha1 create mode 100644 solr/licenses/xz-1.0.jar.sha1 create mode 100644 solr/licenses/xz-LICENSE-PD.txt create mode 100644 solr/licenses/xz-NOTICE.txt diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index c24f5f0b416..1d2abc15758 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -133,47 +133,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index f408a24ae08..3046fc4a642 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -26,6 +26,14 @@ $Id$ ================== 4.0.0 ================== +Versions of Major Components +--------------------- +Apache Tika 1.2 +Carrot2 3.5.0 +Velocity 1.6.4 and Velocity Tools 2.0 +Apache UIMA 2.3.1 +Apache ZooKeeper 3.3.6 + Upgrading from Solr 4.0.0-BETA ---------------------- @@ -82,6 +90,7 @@ Other Changes * SOLR-3691: SimplePostTool: Mode for crawling/posting web pages See http://wiki.apache.org/solr/ExtractingRequestHandler for examples (janhoy) +* SOLR-3707: Upgrade Solr to Tika 1.2 (janhoy) ================== 4.0.0-BETA =================== @@ -291,7 +300,6 @@ Other Changes Also, the configuration itself can be passed using the "dataConfig" parameter rather than using a file (this previously worked in debug mode only). When configuration errors are encountered, the error message is returned in XML format. (James Dyer) - * SOLR-3439: Make SolrCell easier to use out of the box. Also improves "/browse" to display rich-text documents correctly, along with facets for author and content_type. With the new "content" field, highlighting of body is supported. See also SOLR-3672 for diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt index 4b237d98ebe..b22247b12b0 100644 --- a/solr/NOTICE.txt +++ b/solr/NOTICE.txt @@ -310,12 +310,11 @@ Copyright 2004 Sun Microsystems, Inc. (Rome JAR) Copyright 2002-2008 by John Cowan (TagSoup -- http://ccil.org/~cowan/XML/tagsoup/) -Copyright (C) 1999-2007 Shigeru Chiba. All Rights Reserved. -(Javassist, MPL licensed: http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/) - Copyright (C) 1994-2007 by the Xiph.org Foundation, http://www.xiph.org/ (OggVorbis) -Scannotation (C) Bill Burke +Copyright 2012 Kohei Taketa juniversalchardet (http://code.google.com/p/juniversalchardet/) + +Lasse Collin and others, XZ for Java (http://tukaani.org/xz/java.html) ========================================================================= == Language Detection Notices == diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml index 71d0d860f4f..335f7f7be34 100644 --- a/solr/contrib/extraction/ivy.xml +++ b/solr/contrib/extraction/ivy.xml @@ -20,36 +20,36 @@ - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java index b1995a718fc..cde7793315c 100644 --- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java +++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java @@ -64,8 +64,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { "fmap.producer", "extractedProducer", "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords", "fmap.Creation-Date", "extractedDate", - "fmap.AAPL:Keywords", "ignored_a", - "fmap.xmpTPg:NPages", "ignored_a", + "uprefix", "ignored_", "fmap.Author", "extractedAuthor", "fmap.content", "extractedContent", "literal.id", "one", @@ -81,6 +80,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { "fmap.Author", "extractedAuthor", "fmap.language", "extractedLanguage", "literal.id", "two", + "uprefix", "ignored_", "fmap.content", "extractedContent", "fmap.Last-Modified", "extractedDate" ); @@ -136,6 +136,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords", "fmap.Author", "extractedAuthor", "literal.id", "three", + "uprefix", "ignored_", "fmap.content", "extractedContent", "fmap.language", "extractedLanguage", "fmap.Last-Modified", "extractedDate" @@ -206,6 +207,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { "fmap.Author", "extractedAuthor", "fmap.content", "extractedContent", "literal.id", "one", + "uprefix", "ignored_", "fmap.language", "extractedLanguage", "literal.extractionLiteralMV", "one", "literal.extractionLiteralMV", "two", @@ -374,9 +376,8 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { loadLocal("extraction/arabic.pdf", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer", "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords", "fmap.Creation-Date", "extractedDate", - "fmap.AAPL:Keywords", "ignored_a", - "fmap.xmpTPg:NPages", "ignored_a", "fmap.Author", "extractedAuthor", + "uprefix", "ignored_", "fmap.content", "wdf_nocase", "literal.id", "one", "fmap.Last-Modified", "extractedDate"); @@ -404,8 +405,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { loadLocal("extraction/password-is-solrcell.docx", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer", "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords", "fmap.Creation-Date", "extractedDate", - "fmap.AAPL:Keywords", "ignored_a", - "fmap.xmpTPg:NPages", "ignored_a", + "uprefix", "ignored_", "fmap.Author", "extractedAuthor", "fmap.content", "wdf_nocase", "literal.id", "one", @@ -462,8 +462,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { "fmap.content", "extractedContent", "fmap.language", "extractedLanguage", "fmap.Creation-Date", "extractedDate", - "fmap.AAPL:Keywords", "ignored_a", - "fmap.xmpTPg:NPages", "ignored_a", + "uprefix", "ignored_", "fmap.Last-Modified", "extractedDate"); // Here the literal value should override the Tika-parsed title: @@ -478,8 +477,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { "fmap.content", "extractedContent", "fmap.language", "extractedLanguage", "fmap.Creation-Date", "extractedDate", - "fmap.AAPL:Keywords", "ignored_a", - "fmap.xmpTPg:NPages", "ignored_a", + "uprefix", "ignored_", "fmap.Last-Modified", "extractedDate"); // Here we mimic the old behaviour where literals are added, not overridden @@ -498,8 +496,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { "fmap.content", "extractedContent", "fmap.language", "extractedLanguage", "fmap.Creation-Date", "extractedDate", - "fmap.AAPL:Keywords", "ignored_a", - "fmap.xmpTPg:NPages", "ignored_a", + "uprefix", "ignored_", "fmap.Last-Modified", "extractedDate"); assertU(commit()); diff --git a/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 b/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 new file mode 100644 index 00000000000..f5a55e605e2 --- /dev/null +++ b/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 @@ -0,0 +1 @@ +a81264fe0265ebe8fd1d8128aad06dc320de6eef diff --git a/solr/licenses/apache-mime4j-core-0.7.jar.sha1 b/solr/licenses/apache-mime4j-core-0.7.jar.sha1 deleted file mode 100644 index cba20aa6805..00000000000 --- a/solr/licenses/apache-mime4j-core-0.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a06e8c6d9fa4063df541427686e9f070377b7b8e diff --git a/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 new file mode 100644 index 00000000000..9de5694dc6f --- /dev/null +++ b/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 @@ -0,0 +1 @@ +1c289aa264548a0a1f1b43685a9cb2ab23f67287 diff --git a/solr/licenses/apache-mime4j-dom-0.7.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.7.jar.sha1 deleted file mode 100644 index 6f39664c03a..00000000000 --- a/solr/licenses/apache-mime4j-dom-0.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f0cbe6fd6f8d21843e6646c2d6490a58f60078a9 diff --git a/solr/licenses/commons-compress-1.3.jar.sha1 b/solr/licenses/commons-compress-1.3.jar.sha1 deleted file mode 100644 index 548906c8b33..00000000000 --- a/solr/licenses/commons-compress-1.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -613a08bc72e2e9a43c9f87b9ff8352b47e18e3ae diff --git a/solr/licenses/commons-compress-1.4.1.jar.sha1 b/solr/licenses/commons-compress-1.4.1.jar.sha1 new file mode 100644 index 00000000000..f64e67e42a9 --- /dev/null +++ b/solr/licenses/commons-compress-1.4.1.jar.sha1 @@ -0,0 +1 @@ +b02e84a993d88568417536240e970c4b809126fd diff --git a/solr/licenses/commons-compress-NOTICE.txt b/solr/licenses/commons-compress-NOTICE.txt index 1a1f52c9016..07baa98630b 100644 --- a/solr/licenses/commons-compress-NOTICE.txt +++ b/solr/licenses/commons-compress-NOTICE.txt @@ -1,5 +1,5 @@ Apache Commons Compress -Copyright 2002-2011 The Apache Software Foundation +Copyright 2002-2012 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). diff --git a/solr/licenses/fontbox-1.6.0.jar.sha1 b/solr/licenses/fontbox-1.6.0.jar.sha1 deleted file mode 100644 index 6beed5764a6..00000000000 --- a/solr/licenses/fontbox-1.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c59ede61204faa09c407a6b1c64a6e21d6f57548 diff --git a/solr/licenses/fontbox-1.7.0.jar.sha1 b/solr/licenses/fontbox-1.7.0.jar.sha1 new file mode 100644 index 00000000000..8be456d1592 --- /dev/null +++ b/solr/licenses/fontbox-1.7.0.jar.sha1 @@ -0,0 +1 @@ +a37220d35b0c673a9543b4853152b57fb77ac513 diff --git a/solr/licenses/fontbox-NOTICE.txt b/solr/licenses/fontbox-NOTICE.txt index effa7efcb83..a2e87e5ff8c 100644 --- a/solr/licenses/fontbox-NOTICE.txt +++ b/solr/licenses/fontbox-NOTICE.txt @@ -1,6 +1,6 @@ Apache FontBox -Copyright 2008-2010 The Apache Software Foundation +Copyright 2008-2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/solr/licenses/isoparser-1.0-RC-1.jar.sha1 b/solr/licenses/isoparser-1.0-RC-1.jar.sha1 new file mode 100644 index 00000000000..cdf30714509 --- /dev/null +++ b/solr/licenses/isoparser-1.0-RC-1.jar.sha1 @@ -0,0 +1 @@ +4a5768b1070b9488a433362d736720fd7a7b264f diff --git a/solr/licenses/isoparser-LICENSE-ASL.txt b/solr/licenses/isoparser-1.0-RC-LICENSE-ASL.txt similarity index 100% rename from solr/licenses/isoparser-LICENSE-ASL.txt rename to solr/licenses/isoparser-1.0-RC-LICENSE-ASL.txt diff --git a/solr/licenses/isoparser-NOTICE.txt b/solr/licenses/isoparser-1.0-RC-NOTICE.txt similarity index 87% rename from solr/licenses/isoparser-NOTICE.txt rename to solr/licenses/isoparser-1.0-RC-NOTICE.txt index 21d5546ffb9..4e1b1d9b981 100644 --- a/solr/licenses/isoparser-NOTICE.txt +++ b/solr/licenses/isoparser-1.0-RC-NOTICE.txt @@ -19,8 +19,5 @@ The Apache Software Foundation (http://www.apache.org/). This product includes software (Hex Encoder extracted from commons-codec) developed by The Apache Software Foundation (http://www.apache.org/). -This product includes software (JHexEditor) developed by -Germán Laullón (http://www.apache.org/). - This product includes software (package com.googlecode.mp4parser.h264) developed by -Stanislav Vitvitskiy and originally licensed under MIT license (http://www.opensource.org/licenses/mit-license.php) +Stanislav Vitvitskiy and originally licensed under MIT license (http://www.opensource.org/licenses/mit-license.php) \ No newline at end of file diff --git a/solr/licenses/isoparser-1.0-beta-5.jar.sha1 b/solr/licenses/isoparser-1.0-beta-5.jar.sha1 deleted file mode 100644 index 752abcd2c1b..00000000000 --- a/solr/licenses/isoparser-1.0-beta-5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -587a6e3f9f6258838b05a7033b16699841a957d5 diff --git a/solr/licenses/javassist-3.6.0.GA.jar.sha1 b/solr/licenses/javassist-3.6.0.GA.jar.sha1 deleted file mode 100644 index 6e23d92d697..00000000000 --- a/solr/licenses/javassist-3.6.0.GA.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -231ae32c1b165696970362bea2ff022ce268f545 diff --git a/solr/licenses/jempbox-1.6.0.jar.sha1 b/solr/licenses/jempbox-1.6.0.jar.sha1 deleted file mode 100644 index 2ad507e0637..00000000000 --- a/solr/licenses/jempbox-1.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b4c612d88a2a86e540edbf1125b1f095513cd65e diff --git a/solr/licenses/jempbox-1.7.0.jar.sha1 b/solr/licenses/jempbox-1.7.0.jar.sha1 new file mode 100644 index 00000000000..22082461164 --- /dev/null +++ b/solr/licenses/jempbox-1.7.0.jar.sha1 @@ -0,0 +1 @@ +d2f3d15fa0182e16e7f04fd37d2003dbd22d3e37 diff --git a/solr/licenses/jempbox-NOTICE.txt b/solr/licenses/jempbox-NOTICE.txt index 4e39ec478bf..a8affe37702 100644 --- a/solr/licenses/jempbox-NOTICE.txt +++ b/solr/licenses/jempbox-NOTICE.txt @@ -1,6 +1,6 @@ Apache JempBox -Copyright 2008-2010 The Apache Software Foundation +Copyright 2008-2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/solr/licenses/juniversalchardet-1.0.3.jar.sha1 b/solr/licenses/juniversalchardet-1.0.3.jar.sha1 new file mode 100644 index 00000000000..6b06952678f --- /dev/null +++ b/solr/licenses/juniversalchardet-1.0.3.jar.sha1 @@ -0,0 +1 @@ +cd49678784c46aa8789c060538e0154013bb421b diff --git a/solr/licenses/juniversalchardet-LICENSE-MPL.txt b/solr/licenses/juniversalchardet-LICENSE-MPL.txt new file mode 100644 index 00000000000..06f965147a8 --- /dev/null +++ b/solr/licenses/juniversalchardet-LICENSE-MPL.txt @@ -0,0 +1,469 @@ + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] diff --git a/solr/licenses/juniversalchardet-NOTICE.txt b/solr/licenses/juniversalchardet-NOTICE.txt new file mode 100644 index 00000000000..0269c49838b --- /dev/null +++ b/solr/licenses/juniversalchardet-NOTICE.txt @@ -0,0 +1,6 @@ +Project home page: http://code.google.com/p/juniversalchardet/ +Java port by Kohei TAKETA (No copyright specified) + +The library is subject to the Mozilla Public License Version 1.1. +Alternatively, the library may be used under the terms of either the GNU General Public License Version 2 or later, +or the GNU Lesser General Public License 2.1 or later. \ No newline at end of file diff --git a/solr/licenses/pdfbox-1.6.0.jar.sha1 b/solr/licenses/pdfbox-1.6.0.jar.sha1 deleted file mode 100644 index c6b320f17e9..00000000000 --- a/solr/licenses/pdfbox-1.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fdc454f4925cca53a7140bfc7a61c74f80b2dd8 diff --git a/solr/licenses/pdfbox-1.7.0.jar.sha1 b/solr/licenses/pdfbox-1.7.0.jar.sha1 new file mode 100644 index 00000000000..378b0aae73b --- /dev/null +++ b/solr/licenses/pdfbox-1.7.0.jar.sha1 @@ -0,0 +1 @@ +45c684543f4a59a22aa32ae14bb73ea66cbeccb6 diff --git a/solr/licenses/pdfbox-NOTICE.txt b/solr/licenses/pdfbox-NOTICE.txt index 06f5844677f..0d67b51ff03 100644 --- a/solr/licenses/pdfbox-NOTICE.txt +++ b/solr/licenses/pdfbox-NOTICE.txt @@ -1,10 +1,14 @@ - Apache PDFBox -Copyright 2002-2010 The Apache Software Foundation +Copyright 2011 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - -Based on source code contributed to the original PDFBox project. +Based on source code originally developed in the PDFBox, JempBox and +FontBox projects. Copyright (c) 2002-2007, www.pdfbox.org +Copyright (c) 2006-2007, www.jempbox.org + +Based on source code originally developed in the PaDaF project. +Copyright (c) 2010 Atos Worldline SAS + diff --git a/solr/licenses/poi-3.8-beta5.jar.sha1 b/solr/licenses/poi-3.8-beta5.jar.sha1 deleted file mode 100644 index d6ad71c5383..00000000000 --- a/solr/licenses/poi-3.8-beta5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -44521521d5c9a945eb152fbdbbed1b60b0c11766 diff --git a/solr/licenses/poi-3.8.jar.sha1 b/solr/licenses/poi-3.8.jar.sha1 new file mode 100644 index 00000000000..a8115278b04 --- /dev/null +++ b/solr/licenses/poi-3.8.jar.sha1 @@ -0,0 +1 @@ +552a7703d32c57adb611df084b45f7158e8653f3 diff --git a/solr/licenses/poi-ooxml-3.8-beta5.jar.sha1 b/solr/licenses/poi-ooxml-3.8-beta5.jar.sha1 deleted file mode 100644 index 169d3c0747b..00000000000 --- a/solr/licenses/poi-ooxml-3.8-beta5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c73aa8c5d6cd0483f1680ea33407931b3151fa42 diff --git a/solr/licenses/poi-ooxml-3.8.jar.sha1 b/solr/licenses/poi-ooxml-3.8.jar.sha1 new file mode 100644 index 00000000000..9daaafac1d3 --- /dev/null +++ b/solr/licenses/poi-ooxml-3.8.jar.sha1 @@ -0,0 +1 @@ +235d18adccc2b140fb3f90a2fa859b7ae29d57b8 diff --git a/solr/licenses/poi-ooxml-schemas-3.8-beta5.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.8-beta5.jar.sha1 deleted file mode 100644 index c61898456b8..00000000000 --- a/solr/licenses/poi-ooxml-schemas-3.8-beta5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -171221d31fdac04a68956750b550b8f2aa8d8bbd diff --git a/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 new file mode 100644 index 00000000000..9ade50e03a6 --- /dev/null +++ b/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 @@ -0,0 +1 @@ +cb3b26809ec65eba22143acfddf654bcf70aa009 diff --git a/solr/licenses/poi-scratchpad-3.8-beta5.jar.sha1 b/solr/licenses/poi-scratchpad-3.8-beta5.jar.sha1 deleted file mode 100644 index 801029ebd67..00000000000 --- a/solr/licenses/poi-scratchpad-3.8-beta5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21aa477fd4dcaefe8443f3c5f30dd9b8bec2e3b4 diff --git a/solr/licenses/poi-scratchpad-3.8.jar.sha1 b/solr/licenses/poi-scratchpad-3.8.jar.sha1 new file mode 100644 index 00000000000..b952b556c09 --- /dev/null +++ b/solr/licenses/poi-scratchpad-3.8.jar.sha1 @@ -0,0 +1 @@ +33ef3eb7bd97c0dcdf2873b0e0a0938f013d410c diff --git a/solr/licenses/scannotation-1.0.2.jar.sha1 b/solr/licenses/scannotation-1.0.2.jar.sha1 deleted file mode 100644 index 9a2bf962c4b..00000000000 --- a/solr/licenses/scannotation-1.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e2b4559236410970da0494ca2a24991ccb53fca7 diff --git a/solr/licenses/tika-core-1.1.jar.sha1 b/solr/licenses/tika-core-1.1.jar.sha1 deleted file mode 100644 index 5af1c9fd4a7..00000000000 --- a/solr/licenses/tika-core-1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3bf3a154705ef65df9dbe70be44c2066d1ee8a9e diff --git a/solr/licenses/tika-core-1.2.jar.sha1 b/solr/licenses/tika-core-1.2.jar.sha1 new file mode 100644 index 00000000000..29d34e76334 --- /dev/null +++ b/solr/licenses/tika-core-1.2.jar.sha1 @@ -0,0 +1 @@ +d17ad28bb6030b58449edeed397d87a5661e8cc1 diff --git a/solr/licenses/tika-core-NOTICE.txt b/solr/licenses/tika-core-NOTICE.txt index ceecc5f4da9..a1bf6205886 100644 --- a/solr/licenses/tika-core-NOTICE.txt +++ b/solr/licenses/tika-core-NOTICE.txt @@ -1,8 +1,15 @@ - -Apache Tika core -Copyright 2007-2010 The Apache Software Foundation +Apache Tika +Copyright 2011 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata +This software contains code derived from UCAR/Unidata's NetCDF library. +Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and +Grizzly (http://grizzly.java.net/) + +OpenCSV: Copyright 2005 Bytecode Pty Ltd. Licensed under the Apache License, Version 2.0 + +IPTC Photo Metadata descriptions Copyright 2010 International Press Telecommunications Council. diff --git a/solr/licenses/tika-parsers-1.1.jar.sha1 b/solr/licenses/tika-parsers-1.1.jar.sha1 deleted file mode 100644 index acac68d29be..00000000000 --- a/solr/licenses/tika-parsers-1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ffdc50beb2f969ef67943726858649572af670e1 diff --git a/solr/licenses/tika-parsers-1.2.jar.sha1 b/solr/licenses/tika-parsers-1.2.jar.sha1 new file mode 100644 index 00000000000..c26487e3bdc --- /dev/null +++ b/solr/licenses/tika-parsers-1.2.jar.sha1 @@ -0,0 +1 @@ +ddc3e6ad93bca50e5a0267087d8ced26863bd64d diff --git a/solr/licenses/tika-parsers-NOTICE.txt b/solr/licenses/tika-parsers-NOTICE.txt index ff78126d9e6..4a1d9e082e3 100644 --- a/solr/licenses/tika-parsers-NOTICE.txt +++ b/solr/licenses/tika-parsers-NOTICE.txt @@ -1,8 +1,15 @@ - Apache Tika parsers -Copyright 2007-2010 The Apache Software Foundation +Copyright 2011 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata +This software contains code derived from UCAR/Unidata's NetCDF library. +Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and +Grizzly (http://grizzly.java.net/) + +OpenCSV: Copyright 2005 Bytecode Pty Ltd. Licensed under the Apache License, Version 2.0 + +IPTC Photo Metadata descriptions Copyright 2010 International Press Telecommunications Council. diff --git a/solr/licenses/xz-1.0.jar.sha1 b/solr/licenses/xz-1.0.jar.sha1 new file mode 100644 index 00000000000..9e449a135b4 --- /dev/null +++ b/solr/licenses/xz-1.0.jar.sha1 @@ -0,0 +1 @@ +ecff5cb8b1189514c9d1d8d68eb77ac372e000c9 diff --git a/solr/licenses/xz-LICENSE-PD.txt b/solr/licenses/xz-LICENSE-PD.txt new file mode 100644 index 00000000000..6433d1d9c79 --- /dev/null +++ b/solr/licenses/xz-LICENSE-PD.txt @@ -0,0 +1,8 @@ +XZ for Java 1.0 (2011-10-22) + +http://tukaani.org/xz/java.html + +This Java implementation of XZ has been put into the public domain, +thus you can do whatever you want with it. All the files in the package +have been written by Lasse Collin, but some files are heavily based +on public domain code written by Igor Pavlov. \ No newline at end of file diff --git a/solr/licenses/xz-NOTICE.txt b/solr/licenses/xz-NOTICE.txt new file mode 100644 index 00000000000..6433d1d9c79 --- /dev/null +++ b/solr/licenses/xz-NOTICE.txt @@ -0,0 +1,8 @@ +XZ for Java 1.0 (2011-10-22) + +http://tukaani.org/xz/java.html + +This Java implementation of XZ has been put into the public domain, +thus you can do whatever you want with it. All the files in the package +have been written by Lasse Collin, but some files are heavily based +on public domain code written by Igor Pavlov. \ No newline at end of file