SOLR-10335: Merge branch 'SOLR-10335' of https://github.com/tballison/lucene-solr

2017-10-13 20:24:25 +05:30 · 2017-10-13 20:24:25 +05:30 · 9d2f0cf254
parent 926cc4d65b 605304d927
commit 9d2f0cf254
49 changed files with 301 additions and 31 deletions
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@ -13,7 +13,7 @@ com.carrotsearch.randomizedtesting.version = 2.5.3


 /com.cybozu.labs/langdetect = 1.1-20120112
-/com.drewnoakes/metadata-extractor = 2.8.1
+/com.drewnoakes/metadata-extractor = 2.9.1

 com.fasterxml.jackson.core.version = 2.5.4
 /com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version}
@ -22,16 +22,18 @@ com.fasterxml.jackson.core.version = 2.5.4
 /com.fasterxml.jackson.dataformat/jackson-dataformat-smile = ${com.fasterxml.jackson.core.version}

 /com.github.ben-manes.caffeine/caffeine = 2.4.0
+/com.github.virtuald/curvesapi = 1.04

 /com.google.guava/guava = 14.0.1

 /com.google.protobuf/protobuf-java = 3.1.0
 /com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
 /com.googlecode.mp4parser/isoparser = 1.1.18
-/com.healthmarketscience.jackcess/jackcess = 2.1.3
+/com.healthmarketscience.jackcess/jackcess = 2.1.8
 /com.ibm.icu/icu4j = 59.1
 /com.pff/java-libpst = 0.8.1

+/com.rometools/rome = 1.5.1
 com.sun.jersey.version = 1.9
 /com.sun.jersey/jersey-core = ${com.sun.jersey.version}
 /com.sun.jersey/jersey-server = ${com.sun.jersey.version}
@ -78,7 +80,6 @@ io.netty.netty-all.version = 4.0.36.Final
 /net.bytebuddy/byte-buddy = 1.6.2
 /net.hydromatic/eigenbase-properties = 1.1.5
 /net.sf.ehcache/ehcache-core = 2.4.4
-/net.sourceforge.jmatio/jmatio = 1.0
 /net.sourceforge.nekohtml/nekohtml = 1.9.17
 /org.antlr/antlr4-runtime = 4.5.1-1

@ -91,7 +92,8 @@ org.apache.calcite.version = 1.13.0
 /org.apache.calcite/calcite-core = ${org.apache.calcite.version}
 /org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}

-/org.apache.commons/commons-compress = 1.11
+/org.apache.commons/commons-collections4 = 4.1
+/org.apache.commons/commons-compress = 1.14
 /org.apache.commons/commons-exec = 1.3
 /org.apache.commons/commons-lang3 = 3.6
 /org.apache.commons/commons-math3 = 3.6.1
@ -159,19 +161,19 @@ org.apache.james.apache.mime4j.version = 0.7.2

 /org.apache.mina/mina-core = 2.0.0-M5

-org.apache.pdfbox.version = 2.0.1
+org.apache.pdfbox.version = 2.0.6
 /org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
-/org.apache.pdfbox/jempbox = 1.8.12
+/org.apache.pdfbox/jempbox = 1.8.13
 /org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
 /org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version}

-org.apache.poi.version = 3.15-beta1
+org.apache.poi.version = 3.17-beta1
 /org.apache.poi/poi = ${org.apache.poi.version}
 /org.apache.poi/poi-ooxml = ${org.apache.poi.version}
 /org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
 /org.apache.poi/poi-scratchpad = ${org.apache.poi.version}

-org.apache.tika.version = 1.13
+org.apache.tika.version = 1.16
 /org.apache.tika/tika-core = ${org.apache.tika.version}
 /org.apache.tika/tika-java7 = ${org.apache.tika.version}
 /org.apache.tika/tika-parsers = ${org.apache.tika.version}
@ -275,8 +277,9 @@ org.slf4j.version = 1.7.7
 /org.slf4j/slf4j-log4j12 = ${org.slf4j.version}
 /org.slf4j/slf4j-simple = ${org.slf4j.version}

-/org.tukaani/xz = 1.5
-/rome/rome = 1.0
+/org.tallison/jmatio = 1.2
+/org.tukaani/xz = 1.6
+

 ua.net.nlp.morfologik-ukrainian-search.version = 3.9.0
 /ua.net.nlp/morfologik-ukrainian-search = ${ua.net.nlp.morfologik-ukrainian-search.version}
--- a/lucene/licenses/commons-compress-1.11.jar.sha1
+++ b/lucene/licenses/commons-compress-1.11.jar.sha1
@ -1 +0,0 @@
-f43ce4c878078cbcfbb061353aa672a4c8e81443
--- a/lucene/licenses/commons-compress-1.14.jar.sha1
+++ b/lucene/licenses/commons-compress-1.14.jar.sha1
@ -0,0 +1 @@
+7b18320d668ab080758bf5383d6d8fcf750babce
--- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
@ -20,6 +20,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.EmptyParser;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.html.HtmlMapper;
@ -62,6 +63,7 @@ import static org.apache.solr.handler.dataimport.XPathEntityProcessor.URL;
 * @since solr 3.1
 */
 public class TikaEntityProcessor extends EntityProcessorBase {
+  private static Parser EMPTY_PARSER = new EmptyParser();
  private TikaConfig tikaConfig;
  private String format = "text";
  private boolean done = false;
@ -155,6 +157,8 @@ public class TikaEntityProcessor extends EntityProcessorBase {
        }
        if (extractEmbedded) {
          context.set(Parser.class, tikaParser);
+        } else {
+          context.set(Parser.class, EMPTY_PARSER);
        }
        tikaParser.parse(is, contentHandler, metadata , context);
    } catch (Exception e) {
--- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/test_vsdx.vsdx
+++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/test_vsdx.vsdx
--- a/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
@ -62,6 +62,15 @@ public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
          "  </document>" +
          "</dataConfig>";

+  private String vsdxConf =
+      "<dataConfig>" +
+          "  <dataSource type=\"BinFileDataSource\"/>" +
+          "  <document>" +
+          "    <entity name=\"Tika\" processor=\"TikaEntityProcessor\" url=\"" + getFile("dihextras/test_vsdx.vsdx").getAbsolutePath() + "\" >" +
+          "      <field column=\"text\"/>" +
+          "     </entity>" +
+          "  </document>" +
+          "</dataConfig>";

  private String[] tests = {
      "//*[@numFound='1']"
@ -100,6 +109,11 @@ public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
      "//str[@name='text'][not(contains(.,'When in the Course'))]"
  };

+  private String[] testsVSDX = {
+      "//*[@numFound='1']",
+      "//str[@name='text'][contains(.,'Arrears')]"
+  };
+
  @BeforeClass
  public static void beforeClass() throws Exception {
    assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
@ -119,6 +133,14 @@ public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
    assertQ(req("*:*"), "//*[@numFound='1']");
  }

+  @Test
+  public void testVSDX() throws Exception {
+    //this ensures that we've included the curvesapi dependency
+    //and that the ConnectsType class is bundled with poi-ooxml-schemas.
+    runFullImport(vsdxConf);
+    assertQ(req("*:*"), testsVSDX);
+  }
+
  @Test
  public void testTikaHTMLMapperEmpty() throws Exception {
    runFullImport(getConfigHTML(null));
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@ -50,18 +50,20 @@
    <dependency org="org.apache.poi" name="poi-ooxml" rev="${/org.apache.poi/poi-ooxml}" conf="compile"/>
    <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="${/org.apache.poi/poi-ooxml-schemas}" conf="compile"/>
    <dependency org="org.apache.xmlbeans" name="xmlbeans" rev="${/org.apache.xmlbeans/xmlbeans}" conf="compile"/>
+    <dependency org="org.apache.commons" name="commons-collections4" rev="${/org.apache.commons/commons-collections4}" conf="compile"/>
+    <dependency org="com.github.virtuald" name="curvesapi" rev="${/com.github.virtuald/curvesapi}" conf="compile"/>
    <dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="${/org.ccil.cowan.tagsoup/tagsoup}" conf="compile"/>
    <dependency org="com.googlecode.mp4parser" name="isoparser" rev="${/com.googlecode.mp4parser/isoparser}" conf="compile"/>
    <dependency org="org.aspectj" name="aspectjrt" rev="${/org.aspectj/aspectjrt}" conf="compile"/>
    <dependency org="com.drewnoakes" name="metadata-extractor" rev="${/com.drewnoakes/metadata-extractor}" conf="compile"/>
    <dependency org="de.l3s.boilerpipe" name="boilerpipe" rev="${/de.l3s.boilerpipe/boilerpipe}" conf="compile"/>
-    <dependency org="rome" name="rome" rev="${/rome/rome}" conf="compile"/>
+    <dependency org="com.rometools" name="rome" rev="${/com.rometools/rome}" conf="compile"/>
    <dependency org="jdom" name="jdom" rev="${/jdom/jdom}" conf="compile"/>
    <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" conf="compile"/>
    <dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" conf="compile"/>
    <dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" conf="compile"/>
    <dependency org="com.pff" name="java-libpst" rev="${/com.pff/java-libpst}" conf="compile"/>
-    <dependency org="net.sourceforge.jmatio" name="jmatio" rev="${/net.sourceforge.jmatio/jmatio}" conf="compile"/>
+    <dependency org="org.tallison" name="jmatio" rev="${/org.tallison/jmatio}" conf="compile"/>

    <!-- Other ExtractingRequestHandler dependencies -->
    <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile"/>
--- a/solr/licenses/commons-collections4-4.1.jar.sha1
+++ b/solr/licenses/commons-collections4-4.1.jar.sha1
@ -0,0 +1 @@
+a4cf4688fe1c7e3a63aa636cc96d013af537768e
--- a/solr/licenses/commons-collections4-LICENSE-ASL.txt
+++ b/solr/licenses/commons-collections4-LICENSE-ASL.txt
@ -0,0 +1,202 @@
+
+                                 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.
--- a/solr/licenses/commons-collections4-NOTICE.txt
+++ b/solr/licenses/commons-collections4-NOTICE.txt
@ -0,0 +1,5 @@
+Apache Commons Collections
+Copyright 2001-2017 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
--- a/solr/licenses/commons-compress-1.11.jar.sha1
+++ b/solr/licenses/commons-compress-1.11.jar.sha1
@ -1 +0,0 @@
-f43ce4c878078cbcfbb061353aa672a4c8e81443
--- a/solr/licenses/commons-compress-1.14.jar.sha1
+++ b/solr/licenses/commons-compress-1.14.jar.sha1
@ -0,0 +1 @@
+7b18320d668ab080758bf5383d6d8fcf750babce
--- a/solr/licenses/curvesapi-1.04.jar.sha1
+++ b/solr/licenses/curvesapi-1.04.jar.sha1
@ -0,0 +1 @@
+3386abf821719bc89c7685f9eaafaf4a842f0199
--- a/solr/licenses/curvesapi-LICENSE-BSD_LIKE.txt
+++ b/solr/licenses/curvesapi-LICENSE-BSD_LIKE.txt
@ -0,0 +1,28 @@
+Copyright (c) 2005, Graph Builder
+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 Graph Builder 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 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.
--- a/solr/licenses/curvesapi-NOTICE.txt
+++ b/solr/licenses/curvesapi-NOTICE.txt
@ -0,0 +1,2 @@
+Copyright (c) 2005, Graph Builder
+All rights reserved.
--- a/solr/licenses/fontbox-2.0.1.jar.sha1
+++ b/solr/licenses/fontbox-2.0.1.jar.sha1
@ -1 +0,0 @@
-b9d4f0993e015f3f1ce0be9e7300cf62dd7a7f15
--- a/solr/licenses/fontbox-2.0.6.jar.sha1
+++ b/solr/licenses/fontbox-2.0.6.jar.sha1
@ -0,0 +1 @@
+33f44ea67f1b5ab314e2d5768365b1a3e794fb3b
--- a/solr/licenses/jackcess-2.1.3.jar.sha1
+++ b/solr/licenses/jackcess-2.1.3.jar.sha1
@ -1 +0,0 @@
-fe8553847c6744d61e071ef11a6a64010731d241
--- a/solr/licenses/jackcess-2.1.8.jar.sha1
+++ b/solr/licenses/jackcess-2.1.8.jar.sha1
@ -0,0 +1 @@
+dfc7156e11ce33bbcb7f4f6724a87b9d969f2fd6
--- a/solr/licenses/jempbox-1.8.12.jar.sha1
+++ b/solr/licenses/jempbox-1.8.12.jar.sha1
@ -1 +0,0 @@
-426450c573c19f6f2c751a7a52c11931b712c9f6
--- a/solr/licenses/jempbox-1.8.13.jar.sha1
+++ b/solr/licenses/jempbox-1.8.13.jar.sha1
@ -0,0 +1 @@
+a874cef0ed0e2a8c4cc5ed52c23ba3e6d78eca4e
--- a/solr/licenses/jmatio-1.0.jar.sha1
+++ b/solr/licenses/jmatio-1.0.jar.sha1
@ -1 +0,0 @@
-df72993ea17d34c3bacd983558d2970a866abaf6
--- a/solr/licenses/jmatio-1.2.jar.sha1
+++ b/solr/licenses/jmatio-1.2.jar.sha1
@ -0,0 +1 @@
+69d8f2f49c1503f9b15b0eb50b1905a734a025e2
--- a/solr/licenses/metadata-extractor-2.8.1.jar.sha1
+++ b/solr/licenses/metadata-extractor-2.8.1.jar.sha1
@ -1 +0,0 @@
-120630f96316e0f173aedf0c88bb06c5e146ad96
--- a/solr/licenses/metadata-extractor-2.9.1.jar.sha1
+++ b/solr/licenses/metadata-extractor-2.9.1.jar.sha1
@ -0,0 +1 @@
+53fdf22be10c9d426ec63431c7342895bc642261
--- a/solr/licenses/pdfbox-2.0.1.jar.sha1
+++ b/solr/licenses/pdfbox-2.0.1.jar.sha1
@ -1 +0,0 @@
-dbc69649118b7eff278f228c070a40ee559e1f62
--- a/solr/licenses/pdfbox-2.0.6.jar.sha1
+++ b/solr/licenses/pdfbox-2.0.6.jar.sha1
@ -0,0 +1 @@
+68616a583c5f9b9ba72140364d15a07cd937ce0e
--- a/solr/licenses/pdfbox-tools-2.0.1.jar.sha1
+++ b/solr/licenses/pdfbox-tools-2.0.1.jar.sha1
@ -1 +0,0 @@
-a585a59c58f822884b1c5e56b670efa9241b699d
--- a/solr/licenses/pdfbox-tools-2.0.6.jar.sha1
+++ b/solr/licenses/pdfbox-tools-2.0.6.jar.sha1
@ -0,0 +1 @@
+3b0c2622015c048a29496291cfe44f235f5c7cdf
--- a/solr/licenses/poi-3.15-beta1.jar.sha1
+++ b/solr/licenses/poi-3.15-beta1.jar.sha1
@ -1 +0,0 @@
-048bb8326b81323631d9ceb4236cfbd382e56da2
--- a/solr/licenses/poi-3.17-beta1.jar.sha1
+++ b/solr/licenses/poi-3.17-beta1.jar.sha1
@ -0,0 +1 @@
+d2df762cc8301c257db1fd0f4fc2f37ed9fbbb78
--- a/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1
+++ b/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1
@ -1 +0,0 @@
-81085a47fdf0d74d473d605c6b3784e26731842e
--- a/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1
+++ b/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1
@ -0,0 +1 @@
+96f537614c5f5ec232fb8832313280dcb93c59ab
--- a/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1
+++ b/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1
@ -1 +0,0 @@
-f8bc979ad79908a99483337f1ca2edf78558ac20
--- a/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1
+++ b/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1
@ -0,0 +1 @@
+99811dc063afea4cde813726ba6f45f724bf2c3b
--- a/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1
+++ b/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1
@ -1 +0,0 @@
-f4e276aaf97a60a1156388c9e38069122b7ea914
--- a/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1
+++ b/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1
@ -0,0 +1 @@
+d4ad39b023c377ec534ab25205344eb79da4996b
--- a/solr/licenses/rome-1.0.jar.sha1
+++ b/solr/licenses/rome-1.0.jar.sha1
@ -1 +0,0 @@
-022b33347f315833e9348cec2751af1a5d5656e4
--- a/solr/licenses/rome-1.5.1.jar.sha1
+++ b/solr/licenses/rome-1.5.1.jar.sha1
@ -0,0 +1 @@
+cc3489f066749bede7fc81f4e80c0d8c9534a210
--- a/solr/licenses/tika-core-1.13.jar.sha1
+++ b/solr/licenses/tika-core-1.13.jar.sha1
@ -1 +0,0 @@
-1305c798d41d1d7bbf12cb7c0ca184c98eed25ad
--- a/solr/licenses/tika-core-1.16.jar.sha1
+++ b/solr/licenses/tika-core-1.16.jar.sha1
@ -0,0 +1 @@
+7b75cb2b65f6d014b6a3e4793835f5759168c34e
--- a/solr/licenses/tika-java7-1.13.jar.sha1
+++ b/solr/licenses/tika-java7-1.13.jar.sha1
@ -1 +0,0 @@
-d6ffea1f1f76faa01509598b8a31f54b3da124cd
--- a/solr/licenses/tika-java7-1.16.jar.sha1
+++ b/solr/licenses/tika-java7-1.16.jar.sha1
@ -0,0 +1 @@
+b4d7dc8dd2f592824cb0fa0677d08fe9bbee2ab4
--- a/solr/licenses/tika-parsers-1.13.jar.sha1
+++ b/solr/licenses/tika-parsers-1.13.jar.sha1
@ -1 +0,0 @@
-374fde67b9d35f785534b0e6c4953533c31bab5f
--- a/solr/licenses/tika-parsers-1.16.jar.sha1
+++ b/solr/licenses/tika-parsers-1.16.jar.sha1
@ -0,0 +1 @@
+bececafbe32c013eae8d3f3cf10d28b136a6f9d7
--- a/solr/licenses/tika-xmp-1.13.jar.sha1
+++ b/solr/licenses/tika-xmp-1.13.jar.sha1
@ -1 +0,0 @@
-1d73457bcc68ba7df72833baa40b29c39ce4a67e
--- a/solr/licenses/tika-xmp-1.16.jar.sha1
+++ b/solr/licenses/tika-xmp-1.16.jar.sha1
@ -0,0 +1 @@
+06db0bda27d4edf452c5a72a29f78805bfd23a0f
--- a/solr/licenses/xz-1.5.jar.sha1
+++ b/solr/licenses/xz-1.5.jar.sha1
@ -1 +0,0 @@
-9c64274b7dbb65288237216e3fae7877fd3f2bee
--- a/solr/licenses/xz-1.6.jar.sha1
+++ b/solr/licenses/xz-1.6.jar.sha1
@ -0,0 +1 @@
+05b6f921f1810bdf90e25471968f741f87168b64