diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 8655cafc41f..1f12c38c16b 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -24,7 +24,7 @@ $Id$ ================== 4.0.0-dev ================== Versions of Major Components --------------------- -Apache Tika 0.8 +Apache Tika 0.10 Carrot2 3.5.0 Velocity 1.6.4 and Velocity Tools 2.0 Apache UIMA 2.3.1 @@ -403,6 +403,8 @@ Bug Fixes * SOLR-2757: min() and max() functions now support an arbitrary number of ValueSources (Bill Bell via hossman) +* SOLR-2372: Upgrade Solr to Tika 0.10 (janhoy) + ================== 3.4.0 ================== Upgrading from Solr 3.3 diff --git a/solr/contrib/extraction/CHANGES.txt b/solr/contrib/extraction/CHANGES.txt index 9f8ba7dd112..fa3a7060725 100644 --- a/solr/contrib/extraction/CHANGES.txt +++ b/solr/contrib/extraction/CHANGES.txt @@ -17,10 +17,10 @@ You will need Solr up and running. Then, simply add the extraction JAR file, pl to your Solr Home lib directory. See http://wiki.apache.org/solr/ExtractingRequestHandler for more details on hooking it in and configuring. - Tika Dependency - --------------- +Tika Dependency +--------------- -Current Version: Tika 0.8 (released 11/07/2010) +Current Version: Tika 0.10 (released 2011-09-30) $Id$ @@ -30,7 +30,7 @@ $Id$ ================== Release 3.5.0 ================== -(No Changes) +* SOLR-2372: Upgrade Solr to Tika 0.10 (janhoy) ================== Release 3.4.0 ================== diff --git a/solr/contrib/extraction/lib/apache-mime4j-LICENSE-ASL.txt b/solr/contrib/extraction/lib/apache-mime4j-LICENSE-ASL.txt new file mode 100644 index 00000000000..261eeb9e9f8 --- /dev/null +++ b/solr/contrib/extraction/lib/apache-mime4j-LICENSE-ASL.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "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. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/solr/contrib/extraction/lib/apache-mime4j-NOTICE.txt b/solr/contrib/extraction/lib/apache-mime4j-NOTICE.txt new file mode 100644 index 00000000000..61523975eb2 --- /dev/null +++ b/solr/contrib/extraction/lib/apache-mime4j-NOTICE.txt @@ -0,0 +1,13 @@ + ========================================================================= + == NOTICE file for use with the Apache License, Version 2.0, == + ========================================================================= + + Apache JAMES Mime4j + Copyright 2004-2010 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + + This product test suite includes data (mimetools-testmsgs folder) developed + by Eryq and ZeeGee Software Inc as part of the "MIME-tools" Perl5 toolkit + and licensed under the Artistic License diff --git a/solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar b/solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar new file mode 100644 index 00000000000..0e512958d4e --- /dev/null +++ b/solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar @@ -0,0 +1,2 @@ +AnyObjectId[e3c62523fb93b5e2f73365e6cee0d0bc68e48556] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar b/solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar new file mode 100644 index 00000000000..7431cce460f --- /dev/null +++ b/solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar @@ -0,0 +1,2 @@ +AnyObjectId[1f7bf1ea13697ca0243d399ca6e5d864dd8bec0b] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/fontbox-1.3.1.jar b/solr/contrib/extraction/lib/fontbox-1.3.1.jar deleted file mode 100644 index 9ef07f971e5..00000000000 --- a/solr/contrib/extraction/lib/fontbox-1.3.1.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[194e1f0c6e458db0b840b1530534a199306c07d2] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/fontbox-1.6.0.jar b/solr/contrib/extraction/lib/fontbox-1.6.0.jar new file mode 100644 index 00000000000..e03d0869980 --- /dev/null +++ b/solr/contrib/extraction/lib/fontbox-1.6.0.jar @@ -0,0 +1,2 @@ +AnyObjectId[c3492fc29b757af3ac49f8fe7e171676d43c1490] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/jempbox-1.3.1.jar b/solr/contrib/extraction/lib/jempbox-1.3.1.jar deleted file mode 100644 index 989f389fcf3..00000000000 --- a/solr/contrib/extraction/lib/jempbox-1.3.1.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[371c2537fc26548ca8187f426900b34d9ab8b435] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/jempbox-1.6.0.jar b/solr/contrib/extraction/lib/jempbox-1.6.0.jar new file mode 100644 index 00000000000..af777e2f6f0 --- /dev/null +++ b/solr/contrib/extraction/lib/jempbox-1.6.0.jar @@ -0,0 +1,2 @@ +AnyObjectId[5ca6d7a58b95881d92e04a66c7936bfc596a242a] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/netcdf-4.2-min.jar b/solr/contrib/extraction/lib/netcdf-4.2-min.jar new file mode 100644 index 00000000000..0788d9bc7c9 --- /dev/null +++ b/solr/contrib/extraction/lib/netcdf-4.2-min.jar @@ -0,0 +1,2 @@ +AnyObjectId[deb75868dc3800751e1c3b20428cdefe66838cb1] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/netcdf-4.2.jar b/solr/contrib/extraction/lib/netcdf-4.2.jar deleted file mode 100644 index a26a8890e09..00000000000 --- a/solr/contrib/extraction/lib/netcdf-4.2.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[d93af7f1688eba78bb8580e010adf1ee66ac1d40] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/pdfbox-1.3.1.jar b/solr/contrib/extraction/lib/pdfbox-1.3.1.jar deleted file mode 100644 index 3d016a980d9..00000000000 --- a/solr/contrib/extraction/lib/pdfbox-1.3.1.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[c3cce64a366865316dd1e579a53e6db858166619] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/pdfbox-1.6.0.jar b/solr/contrib/extraction/lib/pdfbox-1.6.0.jar new file mode 100644 index 00000000000..b650239c35f --- /dev/null +++ b/solr/contrib/extraction/lib/pdfbox-1.6.0.jar @@ -0,0 +1,2 @@ +AnyObjectId[75efe034f1b106938d8c1c1b250b15d39cc0e85b] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-3.7.jar b/solr/contrib/extraction/lib/poi-3.7.jar deleted file mode 100644 index f45329703f5..00000000000 --- a/solr/contrib/extraction/lib/poi-3.7.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[a08d953500f508864bb22ff1306f396d8b634c22] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-3.8-beta4.jar b/solr/contrib/extraction/lib/poi-3.8-beta4.jar new file mode 100644 index 00000000000..26ff170ba1b --- /dev/null +++ b/solr/contrib/extraction/lib/poi-3.8-beta4.jar @@ -0,0 +1,2 @@ +AnyObjectId[599102bc1ab991d4f9c784ccc7c4aa935f1c082d] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-ooxml-3.7.jar b/solr/contrib/extraction/lib/poi-ooxml-3.7.jar deleted file mode 100644 index bad71afaf64..00000000000 --- a/solr/contrib/extraction/lib/poi-ooxml-3.7.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[5f36eb4e9b23409c8b266b196140975de6da3a80] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar b/solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar new file mode 100644 index 00000000000..e64d73c6170 --- /dev/null +++ b/solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar @@ -0,0 +1,2 @@ +AnyObjectId[1fe163b0ab7ed93d7056545ef6fbf8973739c3c8] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-ooxml-schemas-3.7.jar b/solr/contrib/extraction/lib/poi-ooxml-schemas-3.7.jar deleted file mode 100644 index 8f593a9f7d6..00000000000 --- a/solr/contrib/extraction/lib/poi-ooxml-schemas-3.7.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[82282b542613378e3bd46c6850c6ac1e715b5f11] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar b/solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar new file mode 100644 index 00000000000..caa54947a7c --- /dev/null +++ b/solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar @@ -0,0 +1,2 @@ +AnyObjectId[00f78f005a8c127a467bb705809e6f4486b997f7] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-scratchpad-3.7.jar b/solr/contrib/extraction/lib/poi-scratchpad-3.7.jar deleted file mode 100644 index c3415432e75..00000000000 --- a/solr/contrib/extraction/lib/poi-scratchpad-3.7.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[6fd02d419c0653c0127773ad3f22e186c03764cb] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar b/solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar new file mode 100644 index 00000000000..ff715946b0a --- /dev/null +++ b/solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar @@ -0,0 +1,2 @@ +AnyObjectId[c6eb9b6c6768e00b5d0a2ee914840d559aee40b8] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/poi-ooxml-scratchpad-NOTICE.txt b/solr/contrib/extraction/lib/poi-scratchpad-NOTICE.txt similarity index 100% rename from solr/contrib/extraction/lib/poi-ooxml-scratchpad-NOTICE.txt rename to solr/contrib/extraction/lib/poi-scratchpad-NOTICE.txt diff --git a/solr/contrib/extraction/lib/tagsoup-1.2.1.jar b/solr/contrib/extraction/lib/tagsoup-1.2.1.jar new file mode 100644 index 00000000000..4f5e3fd452d --- /dev/null +++ b/solr/contrib/extraction/lib/tagsoup-1.2.1.jar @@ -0,0 +1,2 @@ +AnyObjectId[27516019174e55260029068045cdfca584b5e21b] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/tagsoup-1.2.jar b/solr/contrib/extraction/lib/tagsoup-1.2.jar deleted file mode 100644 index 95267dcb1d0..00000000000 --- a/solr/contrib/extraction/lib/tagsoup-1.2.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[af27803ec117e6ec643b8522e266481253b35fe3] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/tika-core-0.10.jar b/solr/contrib/extraction/lib/tika-core-0.10.jar new file mode 100644 index 00000000000..fc3b33110f3 --- /dev/null +++ b/solr/contrib/extraction/lib/tika-core-0.10.jar @@ -0,0 +1,2 @@ +AnyObjectId[2259a3b83e63f6ad14b866bff7925b2a1b9f0c23] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/tika-core-0.8.jar b/solr/contrib/extraction/lib/tika-core-0.8.jar deleted file mode 100644 index 56c34842918..00000000000 --- a/solr/contrib/extraction/lib/tika-core-0.8.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[809e47cc4fb901a2fd67c99b70952c36243a0cd2] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/tika-parsers-0.10.jar b/solr/contrib/extraction/lib/tika-parsers-0.10.jar new file mode 100644 index 00000000000..9392674cad2 --- /dev/null +++ b/solr/contrib/extraction/lib/tika-parsers-0.10.jar @@ -0,0 +1,2 @@ +AnyObjectId[57368ebb26d4b6493e76efa5552b2e489bc09bbe] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/tika-parsers-0.8.jar b/solr/contrib/extraction/lib/tika-parsers-0.8.jar deleted file mode 100644 index b36aaaaf3e5..00000000000 --- a/solr/contrib/extraction/lib/tika-parsers-0.8.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[25d23ac5cf511587131a9e9ee58ad384ccf6f57c] was removed in git history. -Apache SVN contains full history. \ No newline at end of file