You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2017/12/25 01:23:20 UTC
lucene-solr:master: SOLR-11701: Upgrade to Tika 1.17 when available
Repository: lucene-solr
Updated Branches:
refs/heads/master 43f17f7af -> 7e321d70d
SOLR-11701: Upgrade to Tika 1.17 when available
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7e321d70
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7e321d70
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7e321d70
Branch: refs/heads/master
Commit: 7e321d70df302738358266dfcee892dac79d1c0d
Parents: 43f17f7
Author: Erick Erickson <er...@apache.org>
Authored: Sun Dec 24 17:03:00 2017 -0800
Committer: Erick Erickson <er...@apache.org>
Committed: Sun Dec 24 17:03:00 2017 -0800
----------------------------------------------------------------------
.../dataimporthandler-extras.iml | 1 +
.../idea/solr/contrib/extraction/extraction.iml | 1 +
lucene/ivy-versions.properties | 28 +-
lucene/licenses/slf4j-api-1.7.24.jar.sha1 | 1 +
lucene/licenses/slf4j-api-1.7.7.jar.sha1 | 1 -
solr/CHANGES.txt | 2 +
.../handler/dataimport/TikaEntityProcessor.java | 4 +-
.../src/resources/solr-default-tika-config.xml | 20 +
solr/contrib/extraction/ivy.xml | 9 +-
.../extraction/ExtractingRequestHandler.java | 14 +-
.../handler/extraction/XLSXResponseWriter.java | 5 +-
.../src/resources/solr-default-tika-config.xml | 20 +
solr/core/ivy.xml | 2 +-
.../solr/cloud/rule/ImplicitSnitchTest.java | 2 +
solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 | 1 -
solr/licenses/apache-mime4j-core-0.8.1.jar.sha1 | 1 +
solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 | 1 -
solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1 | 1 +
solr/licenses/bcmail-jdk15-1.45.jar.sha1 | 1 -
solr/licenses/bcmail-jdk15on-1.54.jar.sha1 | 1 +
solr/licenses/bcpkix-jdk15on-1.54.jar.sha1 | 1 +
.../bcpkix-jdk15on-LICENSE-BSD_LIKE.txt | 15 +
solr/licenses/bcpkix-jdk15on-NOTICE.txt | 2 +
solr/licenses/bcprov-jdk15-1.45.jar.sha1 | 1 -
solr/licenses/bcprov-jdk15on-1.54.jar.sha1 | 1 +
solr/licenses/fontbox-2.0.6.jar.sha1 | 1 -
solr/licenses/fontbox-2.0.8.jar.sha1 | 1 +
solr/licenses/jackcess-encrypt-2.1.4.jar.sha1 | 1 +
solr/licenses/jackcess-encrypt-LICENSE-ASL.txt | 507 +++++++++++++++++++
solr/licenses/jackcess-encrypt-NOTICE.txt | 2 +
solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1 | 1 +
solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1 | 1 -
solr/licenses/jdom-1.0.jar.sha1 | 1 -
solr/licenses/jdom-2.0.2.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-1.7.24.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-1.7.7.jar.sha1 | 1 -
.../licenses/metadata-extractor-2.10.1.jar.sha1 | 1 +
solr/licenses/metadata-extractor-2.9.1.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.6.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.8.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.6.jar.sha1 | 1 -
solr/licenses/pdfbox-tools-2.0.8.jar.sha1 | 1 +
solr/licenses/poi-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-3.17.jar.sha1 | 1 +
solr/licenses/poi-ooxml-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-ooxml-3.17.jar.sha1 | 1 +
.../poi-ooxml-schemas-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-ooxml-schemas-3.17.jar.sha1 | 1 +
.../licenses/poi-scratchpad-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-scratchpad-3.17.jar.sha1 | 1 +
solr/licenses/rome-utils-1.5.1.jar.sha1 | 1 +
solr/licenses/rome-utils-LICENSE-ASL.txt | 14 +
solr/licenses/rome-utils-NOTICE.txt | 1 +
solr/licenses/slf4j-api-1.7.24.jar.sha1 | 1 +
solr/licenses/slf4j-api-1.7.7.jar.sha1 | 1 -
solr/licenses/slf4j-log4j12-1.7.24.jar.sha1 | 1 +
solr/licenses/slf4j-log4j12-1.7.7.jar.sha1 | 1 -
solr/licenses/slf4j-simple-1.7.24.jar.sha1 | 1 +
solr/licenses/slf4j-simple-1.7.7.jar.sha1 | 1 -
solr/licenses/tika-core-1.16.jar.sha1 | 1 -
solr/licenses/tika-core-1.17.jar.sha1 | 1 +
solr/licenses/tika-java7-1.16.jar.sha1 | 1 -
solr/licenses/tika-java7-1.17.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.16.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.17.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.16.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.17.jar.sha1 | 1 +
solr/licenses/xmpcore-5.1.2.jar.sha1 | 1 -
solr/licenses/xmpcore-5.1.3.jar.sha1 | 1 +
69 files changed, 649 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml b/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
index 1166d14..8bc21aa 100644
--- a/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
+++ b/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
@@ -8,6 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/dev-tools/idea/solr/contrib/extraction/extraction.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/contrib/extraction/extraction.iml b/dev-tools/idea/solr/contrib/extraction/extraction.iml
index 7ca96fc..15dad16 100644
--- a/dev-tools/idea/solr/contrib/extraction/extraction.iml
+++ b/dev-tools/idea/solr/contrib/extraction/extraction.iml
@@ -8,6 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 35df7ae..72265a7 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -3,7 +3,7 @@
# when the lexical sort check is performed by the ant check-lib-versions target.
/antlr/antlr = 2.7.7
-/com.adobe.xmp/xmpcore = 5.1.2
+/com.adobe.xmp/xmpcore = 5.1.3
com.carrotsearch.randomizedtesting.version = 2.5.3
/com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
@@ -13,7 +13,7 @@ com.carrotsearch.randomizedtesting.version = 2.5.3
/com.cybozu.labs/langdetect = 1.1-20120112
-/com.drewnoakes/metadata-extractor = 2.9.1
+/com.drewnoakes/metadata-extractor = 2.10.1
com.fasterxml.jackson.core.version = 2.5.4
/com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version}
@@ -30,10 +30,13 @@ com.fasterxml.jackson.core.version = 2.5.4
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
/com.googlecode.mp4parser/isoparser = 1.1.18
/com.healthmarketscience.jackcess/jackcess = 2.1.8
+/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
/com.ibm.icu/icu4j = 59.1
/com.pff/java-libpst = 0.8.1
-/com.rometools/rome = 1.5.1
+com.rometools.version = 1.5.1
+/com.rometools/rome = ${com.rometools.version}
+/com.rometools/rome-utils = ${com.rometools.version}
com.sun.jersey.version = 1.9
/com.sun.jersey/jersey-core = ${com.sun.jersey.version}
/com.sun.jersey/jersey-server = ${com.sun.jersey.version}
@@ -70,7 +73,6 @@ io.netty.netty-all.version = 4.0.36.Final
/javax.activation/activation = 1.1.1
/javax.servlet/javax.servlet-api = 3.1.0
/javax.servlet/servlet-api = 2.4
-/jdom/jdom = 1.0
/joda-time/joda-time = 2.2
/junit/junit = 4.10
/log4j/log4j = 1.2.17
@@ -155,7 +157,7 @@ org.apache.hadoop.version = 2.7.4
/org.apache.ivy/ivy = 2.4.0
-org.apache.james.apache.mime4j.version = 0.7.2
+org.apache.james.apache.mime4j.version = 0.8.1
/org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j.version}
/org.apache.james/apache-mime4j-dom = ${org.apache.james.apache.mime4j.version}
@@ -164,19 +166,19 @@ org.apache.james.apache.mime4j.version = 0.7.2
/org.apache.opennlp/opennlp-maxent = 3.0.3
/org.apache.opennlp/opennlp-tools = 1.8.3
-org.apache.pdfbox.version = 2.0.6
+org.apache.pdfbox.version = 2.0.8
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
/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.17-beta1
+org.apache.poi.version = 3.17
/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.16
+org.apache.tika.version = 1.17
/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}
@@ -200,9 +202,10 @@ org.apache.uima.version = 2.3.1
/org.aspectj/aspectjrt = 1.8.0
-org.bouncycastle.version = 1.45
-/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
-/org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
+org.bouncycastle.version = 1.54
+/org.bouncycastle/bcmail-jdk15on = ${org.bouncycastle.version}
+/org.bouncycastle/bcpkix-jdk15on = ${org.bouncycastle.version}
+/org.bouncycastle/bcprov-jdk15on = ${org.bouncycastle.version}
/org.carrot2.attributes/attributes-binder = 1.3.1
/org.carrot2.shaded/carrot2-guava = 18.0
@@ -248,6 +251,7 @@ org.gagravarr.vorbis.java.version = 0.8
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
/org.hsqldb/hsqldb = 2.4.0
+/org.jdom/jdom = 2.0.2
/org.jsoup/jsoup = 1.8.2
@@ -273,7 +277,7 @@ org.restlet.jee.version = 2.3.0
/org.simpleframework/simple-xml = 2.7.1
-org.slf4j.version = 1.7.7
+org.slf4j.version = 1.7.24
/org.slf4j/jcl-over-slf4j = ${org.slf4j.version}
/org.slf4j/jul-to-slf4j = ${org.slf4j.version}
/org.slf4j/slf4j-api = ${org.slf4j.version}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/lucene/licenses/slf4j-api-1.7.24.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/slf4j-api-1.7.24.jar.sha1 b/lucene/licenses/slf4j-api-1.7.24.jar.sha1
new file mode 100644
index 0000000..e2722e7
--- /dev/null
+++ b/lucene/licenses/slf4j-api-1.7.24.jar.sha1
@@ -0,0 +1 @@
+3f6b4bd4f8dbe8d4bea06d107a3826469b85c3e9
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/lucene/licenses/slf4j-api-1.7.7.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/slf4j-api-1.7.7.jar.sha1 b/lucene/licenses/slf4j-api-1.7.7.jar.sha1
deleted file mode 100644
index 1a82218..0000000
--- a/lucene/licenses/slf4j-api-1.7.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b8019b6249bb05d81d3a3094e468753e2b21311
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d182e36..f98d71d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -79,6 +79,8 @@ Other Changes
* SOLR-11754: Remove AbstractSolrTestCase which has long been supplanted by SolrTestCaseJ4. (David Smiley)
+* SOLR-11701: Upgrade to Tika 1.17 when available (Tim Allison, Karthik Ramachandran via Erick Erickson)
+
================== 7.2.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
----------------------------------------------------------------------
diff --git 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
index 95f0073..875032b 100644
--- 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
@@ -86,7 +86,9 @@ public class TikaEntityProcessor extends EntityProcessorBase {
String tikaConfigFile = context.getResolvedEntityAttribute("tikaConfig");
if (tikaConfigFile == null) {
ClassLoader classLoader = context.getSolrCore().getResourceLoader().getClassLoader();
- tikaConfig = new TikaConfig(classLoader);
+ try (InputStream is = classLoader.getResourceAsStream("solr-default-tika-config.xml")) {
+ tikaConfig = new TikaConfig(is);
+ }
} else {
File configFile = new File(tikaConfigFile);
if (!configFile.isAbsolute()) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/contrib/dataimporthandler-extras/src/resources/solr-default-tika-config.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/resources/solr-default-tika-config.xml b/solr/contrib/dataimporthandler-extras/src/resources/solr-default-tika-config.xml
new file mode 100644
index 0000000..b598d9e
--- /dev/null
+++ b/solr/contrib/dataimporthandler-extras/src/resources/solr-default-tika-config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+ -->
+<properties>
+ <service-loader initializableProblemHandler="ignore"/>
+</properties>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/contrib/extraction/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml
index 7143d81..62ba750 100644
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@ -33,6 +33,7 @@
(except slf4j-api, commons-codec, commons-logging, commons-httpclient, geronimo-stax-api_1.0_spec, jcip-annotations, xml-apis, asm)
WARNING: Don't add netcdf / unidataCommon (partially LGPL code) -->
<dependency org="com.healthmarketscience.jackcess" name="jackcess" rev="${/com.healthmarketscience.jackcess/jackcess}" conf="compile"/>
+ <dependency org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="${/com.healthmarketscience.jackcess/jackcess-encrypt}" conf="compile"/>
<dependency org="org.gagravarr" name="vorbis-java-tika" rev="${/org.gagravarr/vorbis-java-tika}" conf="compile"/>
<dependency org="org.gagravarr" name="vorbis-java-core" rev="${/org.gagravarr/vorbis-java-core}" conf="compile"/>
<dependency org="org.apache.james" name="apache-mime4j-core" rev="${/org.apache.james/apache-mime4j-core}" conf="compile"/>
@@ -43,8 +44,9 @@
<dependency org="org.apache.pdfbox" name="fontbox" rev="${/org.apache.pdfbox/fontbox}" conf="compile"/>
<dependency org="org.apache.pdfbox" name="jempbox" rev="${/org.apache.pdfbox/jempbox}" conf="compile"/>
- <dependency org="org.bouncycastle" name="bcmail-jdk15" rev="${/org.bouncycastle/bcmail-jdk15}" conf="compile"/>
- <dependency org="org.bouncycastle" name="bcprov-jdk15" rev="${/org.bouncycastle/bcprov-jdk15}" conf="compile"/>
+ <dependency org="org.bouncycastle" name="bcmail-jdk15on" rev="${/org.bouncycastle/bcmail-jdk15on}" conf="compile"/>
+ <dependency org="org.bouncycastle" name="bcpkix-jdk15on" rev="${/org.bouncycastle/bcpkix-jdk15on}" conf="compile"/>
+ <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="${/org.bouncycastle/bcprov-jdk15on}" conf="compile"/>
<dependency org="org.apache.poi" name="poi" rev="${/org.apache.poi/poi}" conf="compile"/>
<dependency org="org.apache.poi" name="poi-scratchpad" rev="${/org.apache.poi/poi-scratchpad}" conf="compile"/>
<dependency org="org.apache.poi" name="poi-ooxml" rev="${/org.apache.poi/poi-ooxml}" conf="compile"/>
@@ -58,7 +60,8 @@
<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="com.rometools" name="rome" rev="${/com.rometools/rome}" conf="compile"/>
- <dependency org="jdom" name="jdom" rev="${/jdom/jdom}" conf="compile"/>
+ <dependency org="com.rometools" name="rome-utils" rev="${/com.rometools/rome-utils}" conf="compile"/>
+ <dependency org="org.jdom" name="jdom" rev="${/org.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"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
index 82fe633..44f7ac4 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.extraction;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.HashSet;
@@ -37,9 +38,10 @@ import org.apache.solr.security.PermissionNameProvider;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.util.plugin.SolrCoreAware;
import org.apache.tika.config.TikaConfig;
-import org.apache.tika.mime.MimeTypeException;
+import org.apache.tika.exception.TikaException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
/**
@@ -110,9 +112,9 @@ public class ExtractingRequestHandler extends ContentStreamHandlerBase implement
}
}
if (config == null) {
- try {
- config = getDefaultConfig(core.getResourceLoader().getClassLoader());
- } catch (MimeTypeException | IOException e) {
+ try (InputStream is = core.getResourceLoader().getClassLoader().getResourceAsStream("solr-default-tika-config.xml")){
+ config = new TikaConfig(is);
+ } catch (IOException | SAXException | TikaException e) {
throw new SolrException(ErrorCode.SERVER_ERROR, e);
}
}
@@ -122,10 +124,6 @@ public class ExtractingRequestHandler extends ContentStreamHandlerBase implement
factory = createFactory();
}
- private TikaConfig getDefaultConfig(ClassLoader classLoader) throws MimeTypeException, IOException {
- return new TikaConfig(classLoader);
- }
-
protected SolrContentHandlerFactory createFactory() {
return new SolrContentHandlerFactory(dateFormats);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
index 92bd01f..baa1ddb 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
@@ -35,6 +35,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import org.apache.lucene.index.IndexableField;
import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.apache.poi.ss.usermodel.Row;
@@ -116,10 +117,10 @@ class XLSXWriter extends TextResponseWriter {
this.headerStyle = (XSSFCellStyle)swb.createCellStyle();
this.headerStyle.setFillBackgroundColor(IndexedColors.BLACK.getIndex());
//solid fill
- this.headerStyle.setFillPattern((short)1);
+ this.headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
Font headerFont = swb.createFont();
headerFont.setFontHeightInPoints((short)14);
- headerFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
+ headerFont.setBold(true);
headerFont.setColor(IndexedColors.WHITE.getIndex());
this.headerStyle.setFont(headerFont);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/contrib/extraction/src/resources/solr-default-tika-config.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/resources/solr-default-tika-config.xml b/solr/contrib/extraction/src/resources/solr-default-tika-config.xml
new file mode 100644
index 0000000..b598d9e
--- /dev/null
+++ b/solr/contrib/extraction/src/resources/solr-default-tika-config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+ -->
+<properties>
+ <service-loader initializableProblemHandler="ignore"/>
+</properties>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/core/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index 77d3bed..ff4fa48 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -130,7 +130,7 @@
<dependency org="org.apache.directory.api" name="api-all" rev="${/org.apache.directory.api/api-all}" conf="test.MiniKdc"/>
<dependency org="org.apache.directory.jdbm" name="apacheds-jdbm1" rev="${/org.apache.directory.jdbm/apacheds-jdbm1}" conf="test.MiniKdc"/>
<dependency org="org.apache.mina" name="mina-core" rev="${/org.apache.mina/mina-core}" conf="test.MiniKdc"/>
- <dependency org="org.bouncycastle" name="bcprov-jdk15" rev="${/org.bouncycastle/bcprov-jdk15}" conf="test.MiniKdc"/>
+ <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="${/org.bouncycastle/bcprov-jdk15on}" conf="test.MiniKdc"/>
<dependency org="antlr" name="antlr" rev="${/antlr/antlr}" conf="test.MiniKdc"/>
<dependency org="net.sf.ehcache" name="ehcache-core" rev="${/net.sf.ehcache/ehcache-core}" conf="test.MiniKdc"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/core/src/test/org/apache/solr/cloud/rule/ImplicitSnitchTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/rule/ImplicitSnitchTest.java b/solr/core/src/test/org/apache/solr/cloud/rule/ImplicitSnitchTest.java
index 1793770..8c4006d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/rule/ImplicitSnitchTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/rule/ImplicitSnitchTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
import com.google.common.collect.Sets;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestRuleLimitSysouts;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.ZkStateReader;
@@ -38,6 +39,7 @@ import static org.hamcrest.core.Is.is;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
+@TestRuleLimitSysouts.Limit(bytes=32000)
public class ImplicitSnitchTest extends LuceneTestCase {
private ImplicitSnitch snitch;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 b/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
deleted file mode 100644
index f5a55e6..0000000
--- a/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a81264fe0265ebe8fd1d8128aad06dc320de6eef
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1
new file mode 100644
index 0000000..bc78865
--- /dev/null
+++ b/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1
@@ -0,0 +1 @@
+c62dfe18a3b827a2c626ade0ffba44562ddf3f61
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
deleted file mode 100644
index 9de5694..0000000
--- a/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c289aa264548a0a1f1b43685a9cb2ab23f67287
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1
new file mode 100644
index 0000000..727798e
--- /dev/null
+++ b/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1
@@ -0,0 +1 @@
+f2d653c617004193f3350330d907f77b60c88c56
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/bcmail-jdk15-1.45.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcmail-jdk15-1.45.jar.sha1 b/solr/licenses/bcmail-jdk15-1.45.jar.sha1
deleted file mode 100644
index 8fafe38..0000000
--- a/solr/licenses/bcmail-jdk15-1.45.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3aed7e642dd8d39dc14ed1dec3ff79e084637148
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/bcmail-jdk15on-1.54.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcmail-jdk15on-1.54.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.54.jar.sha1
new file mode 100644
index 0000000..c9176a6
--- /dev/null
+++ b/solr/licenses/bcmail-jdk15on-1.54.jar.sha1
@@ -0,0 +1 @@
+9d9b5432b4b29ef4a853223bc6e19379ef116cca
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1
new file mode 100644
index 0000000..f0602d6
--- /dev/null
+++ b/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1
@@ -0,0 +1 @@
+b11bfee99bb11eea344de6e4a07fe89212c55c02
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt b/solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt
new file mode 100644
index 0000000..9dfdf7c
--- /dev/null
+++ b/solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt
@@ -0,0 +1,15 @@
+Copyright (c) 2000-2010 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions
+ of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/bcpkix-jdk15on-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/bcpkix-jdk15on-NOTICE.txt b/solr/licenses/bcpkix-jdk15on-NOTICE.txt
new file mode 100644
index 0000000..be0638a
--- /dev/null
+++ b/solr/licenses/bcpkix-jdk15on-NOTICE.txt
@@ -0,0 +1,2 @@
+Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
+(http://www.bouncycastle.org)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/bcprov-jdk15-1.45.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcprov-jdk15-1.45.jar.sha1 b/solr/licenses/bcprov-jdk15-1.45.jar.sha1
deleted file mode 100644
index bcc01fd..0000000
--- a/solr/licenses/bcprov-jdk15-1.45.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7741883cb07b4634e8b5fd3337113b6ea770a9bb
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/bcprov-jdk15on-1.54.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcprov-jdk15on-1.54.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.54.jar.sha1
new file mode 100644
index 0000000..3f869ac
--- /dev/null
+++ b/solr/licenses/bcprov-jdk15on-1.54.jar.sha1
@@ -0,0 +1 @@
+1acdedeb89f1d950d67b73d481eb7736df65eedb
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/fontbox-2.0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/fontbox-2.0.6.jar.sha1 b/solr/licenses/fontbox-2.0.6.jar.sha1
deleted file mode 100644
index dc11e43..0000000
--- a/solr/licenses/fontbox-2.0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-33f44ea67f1b5ab314e2d5768365b1a3e794fb3b
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/fontbox-2.0.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/fontbox-2.0.8.jar.sha1 b/solr/licenses/fontbox-2.0.8.jar.sha1
new file mode 100644
index 0000000..92adafe
--- /dev/null
+++ b/solr/licenses/fontbox-2.0.8.jar.sha1
@@ -0,0 +1 @@
+52f852fcfc7481d45efdffd224eb78b85981b17b
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1 b/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
new file mode 100644
index 0000000..b0153ec
--- /dev/null
+++ b/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
@@ -0,0 +1 @@
+dfe7134b759597276ff87b7acf662bef1c1c4fd8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jackcess-encrypt-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-encrypt-LICENSE-ASL.txt b/solr/licenses/jackcess-encrypt-LICENSE-ASL.txt
new file mode 100644
index 0000000..3f40d40
--- /dev/null
+++ b/solr/licenses/jackcess-encrypt-LICENSE-ASL.txt
@@ -0,0 +1,507 @@
+
+ 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.
+
+
+APACHE POI SUBCOMPONENTS:
+
+Apache POI includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses:
+
+
+Office Open XML schemas (ooxml-schemas-1.0.jar)
+
+ The Office Open XML schema definitions used by Apache POI are
+ a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
+ As defined in section 9.4 of the ECMA bylaws [2], this specification
+ is available to all interested parties without restriction:
+
+ 9.4 All documents when approved shall be made available to
+ all interested parties without restriction.
+
+ Furthermore, both Microsoft and Adobe have granted patent licenses
+ to this work [3,4,5].
+
+ [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
+ [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
+ [3] http://www.microsoft.com/interop/osp/
+ [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ECMA-376%20Edition%201%20Microsoft%20Patent%20Declaration.pdf
+ [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ga-2006-191.pdf
+
+
+DOM4J library (dom4j-1.6.1.jar)
+
+ Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
+
+ 2. Redistributions in binary form must reproduce the
+ above copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+ 3. The name "DOM4J" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of MetaStuff, Ltd. For written permission,
+ please contact dom4j-info@metastuff.com.
+
+ 4. Products derived from this Software may not be called "DOM4J"
+ nor may "DOM4J" appear in their names without prior written
+ permission of MetaStuff, Ltd. DOM4J is a registered
+ trademark of MetaStuff, Ltd.
+
+ 5. Due credit should be given to the DOM4J Project -
+ http://www.dom4j.org
+
+ THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED 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
+ METASTUFF, LTD. OR ITS 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.
+
+
+JUnit test library (junit-3.8.1.jar)
+
+ Common Public License - v 1.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and
+ documentation distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+
+ ii) additions to the Program;
+
+ where such changes and/or additions to the Program originate from
+ and are distributed by that particular Contributor. A Contribution
+ 'originates' from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include additions to the Program which: (i) are
+ separate modules of software distributed in conjunction with the
+ Program under their own license agreement, and (ii) are not derivative
+ works of the Program.
+
+ "Contributor" means any person or entity that distributes the Program.
+
+ "Licensed Patents " mean patent claims licensable by a Contributor which
+ are necessarily infringed by the use or sale of its Contribution alone
+ or when combined with the Program.
+
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+
+ "Recipient" means anyone who receives the Program under this Agreement,
+ including all Contributors.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license
+ to reproduce, prepare derivative works of, publicly display, publicly
+ perform, distribute and sublicense the Contribution of such
+ Contributor, if any, and such derivative works, in source code and
+ object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and
+ otherwise transfer the Contribution of such Contributor, if any, in
+ source code and object code form. This patent license shall apply to
+ the combination of the Contribution and the Program if, at the time
+ the Contribution is added by the Contributor, such addition of the
+ Contribution causes such combination to be covered by the Licensed
+ Patents. The patent license shall not apply to any other combinations
+ which include the Contribution. No hardware per se is licensed
+ hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the rights
+ and licenses granted hereunder, each Recipient hereby assumes sole
+ responsibility to secure any other intellectual property rights
+ needed, if any. For example, if a third party patent license is
+ required to allow Recipient to distribute the Program, it is
+ Recipient's responsibility to acquire that license before
+ distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+
+ 3. REQUIREMENTS
+
+ A Contributor may choose to distribute the Program in object code form
+ under its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties
+ and conditions, express and implied, including warranties or
+ conditions of title and non-infringement, and implied warranties
+ or conditions of merchantability and fitness for a particular
+ purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability
+ for damages, including direct, indirect, special, incidental and
+ consequential damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are
+ offered by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a
+ reasonable manner on or through a medium customarily used for
+ software exchange.
+
+ When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
+
+ Contributors may not remove or alter any copyright notices contained
+ within the Program.
+
+ Each Contributor must identify itself as the originator of its
+ Contribution, if any, in a manner that reasonably allows subsequent
+ Recipients to identify the originator of the Contribution.
+
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain responsibilities
+ with respect to end users, business partners and the like. While this
+ license is intended to facilitate the commercial use of the Program,
+ the Contributor who includes the Program in a commercial product offering
+ should do so in a manner which does not create potential liability for
+ other Contributors. Therefore, if a Contributor includes the Program
+ in a commercial product offering, such Contributor ("Commercial
+ Contributor") hereby agrees to defend and indemnify every other
+ Contributor ("Indemnified Contributor") against any losses, damages
+ and costs (collectively "Losses") arising from claims, lawsuits and
+ other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such
+ Commercial Contributor in connection with its distribution of the
+ Program in a commercial product offering. The obligations in this
+ section do not apply to any claims or Losses relating to any actual
+ or alleged intellectual property infringement. In order to qualify,
+ an Indemnified Contributor must: a) promptly notify the Commercial
+ Contributor in writing of such claim, and b) allow the Commercial
+ Contributor to control, and cooperate with the Commercial Contributor
+ in, the defense and any related settlement negotiations. The Indemnified
+ Contributor may participate in any such claim at its own expense.
+
+ For example, a Contributor might include the Program in a commercial
+ product offering, Product X. That Contributor is then a Commercial
+ Contributor. If that Commercial Contributor then makes performance
+ claims, or offers warranties related to Product X, those performance
+ claims and warranties are such Commercial Contributor's responsibility
+ alone. Under this section, the Commercial Contributor would have to
+ defend claims against the other Contributors related to those
+ performance claims and warranties, and if a court requires any other
+ Contributor to pay any damages as a result, the Commercial Contributor
+ must pay those damages.
+
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
+ 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. Each Recipient is solely responsible for
+ determining the appropriateness of using and distributing the Program
+ and assumes all risks associated with its exercise of rights under this
+ Agreement, including but not limited to the risks and costs of program
+ errors, compliance with applicable laws, damage to or loss of data,
+ programs or equipment, and unavailability or interruption of operations.
+
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
+ ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+ WITHOUT LIMITATION LOST PROFITS), 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 OR
+ DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+ HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this Agreement, and without further
+ action by the parties hereto, such provision shall be reformed to the
+ minimum extent necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against a Contributor with
+ respect to a patent applicable to software (including a cross-claim or
+ counterclaim in a lawsuit), then any patent licenses granted by that
+ Contributor to such Recipient under this Agreement shall terminate as of
+ the date such litigation is filed. In addition, if Recipient institutes
+ patent litigation against any entity (including a cross-claim or
+ counterclaim in a lawsuit) alleging that the Program itself (excluding
+ combinations of the Program with other software or hardware) infringes
+ such Recipient's patent(s), then such Recipient's rights granted under
+ Section 2(b) shall terminate as of the date such litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it fails
+ to comply with any of the material terms or conditions of this Agreement
+ and does not cure such failure in a reasonable period of time after
+ becoming aware of such noncompliance. If all Recipient's rights under
+ this Agreement terminate, Recipient agrees to cease use and distribution
+ of the Program as soon as reasonably practicable. However, Recipient's
+ obligations under this Agreement and any licenses granted by Recipient
+ relating to the Program shall continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement,
+ but in order to avoid inconsistency the Agreement is copyrighted and may
+ only be modified in the following manner. The Agreement Steward reserves
+ the right to publish new versions (including revisions) of this Agreement
+ from time to time. No one other than the Agreement Steward has the right
+ to modify this Agreement. IBM is the initial Agreement Steward. IBM may
+ assign the responsibility to serve as the Agreement Steward to a suitable
+ separate entity. Each new version of the Agreement will be given a
+ distinguishing version number. The Program (including Contributions) may
+ always be distributed subject to the version of the Agreement under which
+ it was received. In addition, after a new version of the Agreement is
+ published, Contributor may elect to distribute the Program (including
+ its Contributions) under the new version. Except as expressly stated in
+ Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
+ to the intellectual property of any Contributor under this Agreement,
+ whether expressly, by implication, estoppel or otherwise. All rights in
+ the Program not expressly granted under this Agreement are reserved.
+
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to
+ this Agreement will bring a legal action under this Agreement more than
+ one year after the cause of action arose. Each party waives its rights
+ to a jury trial in any resulting litigation.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jackcess-encrypt-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-encrypt-NOTICE.txt b/solr/licenses/jackcess-encrypt-NOTICE.txt
new file mode 100644
index 0000000..99cb4a0
--- /dev/null
+++ b/solr/licenses/jackcess-encrypt-NOTICE.txt
@@ -0,0 +1,2 @@
+Jackcess: http://jackcess.sourceforge.net/
+Copyright (C) 2008-2016 James Ahlborn
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1 b/solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1
new file mode 100644
index 0000000..b3f8afc
--- /dev/null
+++ b/solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1
@@ -0,0 +1 @@
+e6a8629079856a2aa7862c6327ccf6dd1988d7fc
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1 b/solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
deleted file mode 100644
index 6309ee8..0000000
--- a/solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-56003dcd0a31deea6391b9e2ef2f2dc90b205a92
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jdom-1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jdom-1.0.jar.sha1 b/solr/licenses/jdom-1.0.jar.sha1
deleted file mode 100644
index b7db64f..0000000
--- a/solr/licenses/jdom-1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2ac1cd690ab4c80defe7f9bce14d35934c35cec
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jdom-2.0.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jdom-2.0.2.jar.sha1 b/solr/licenses/jdom-2.0.2.jar.sha1
new file mode 100644
index 0000000..2a2eb7a
--- /dev/null
+++ b/solr/licenses/jdom-2.0.2.jar.sha1
@@ -0,0 +1 @@
+d06c71e0df0ac4b94deb737718580ccce22d92e8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jul-to-slf4j-1.7.24.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jul-to-slf4j-1.7.24.jar.sha1 b/solr/licenses/jul-to-slf4j-1.7.24.jar.sha1
new file mode 100644
index 0000000..38c351e
--- /dev/null
+++ b/solr/licenses/jul-to-slf4j-1.7.24.jar.sha1
@@ -0,0 +1 @@
+25a2be668cb2ad1d05d76c0773df73b4b53617fd
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jul-to-slf4j-1.7.7.jar.sha1 b/solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
deleted file mode 100644
index 98b2acc..0000000
--- a/solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-def21bc1a6e648ee40b41a84f1db443132913105
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/metadata-extractor-2.10.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/metadata-extractor-2.10.1.jar.sha1 b/solr/licenses/metadata-extractor-2.10.1.jar.sha1
new file mode 100644
index 0000000..9da3826
--- /dev/null
+++ b/solr/licenses/metadata-extractor-2.10.1.jar.sha1
@@ -0,0 +1 @@
+e1852a8f519dbb0196fdb41bf2c584a8858189f8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/metadata-extractor-2.9.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/metadata-extractor-2.9.1.jar.sha1 b/solr/licenses/metadata-extractor-2.9.1.jar.sha1
deleted file mode 100644
index fcdcfd6..0000000
--- a/solr/licenses/metadata-extractor-2.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-53fdf22be10c9d426ec63431c7342895bc642261
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/pdfbox-2.0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-2.0.6.jar.sha1 b/solr/licenses/pdfbox-2.0.6.jar.sha1
deleted file mode 100644
index 9c93973..0000000
--- a/solr/licenses/pdfbox-2.0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-68616a583c5f9b9ba72140364d15a07cd937ce0e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/pdfbox-2.0.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-2.0.8.jar.sha1 b/solr/licenses/pdfbox-2.0.8.jar.sha1
new file mode 100644
index 0000000..9700a41
--- /dev/null
+++ b/solr/licenses/pdfbox-2.0.8.jar.sha1
@@ -0,0 +1 @@
+17bdf273d66f3afe41eedb9d3ab6a7b819c44a0c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/pdfbox-tools-2.0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-tools-2.0.6.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.6.jar.sha1
deleted file mode 100644
index dfc26a1..0000000
--- a/solr/licenses/pdfbox-tools-2.0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b0c2622015c048a29496291cfe44f235f5c7cdf
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/pdfbox-tools-2.0.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-tools-2.0.8.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.8.jar.sha1
new file mode 100644
index 0000000..1b7b9dc
--- /dev/null
+++ b/solr/licenses/pdfbox-tools-2.0.8.jar.sha1
@@ -0,0 +1 @@
+1c0ba702f74b2d1baca1f0d5e172738b3c122fac
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-3.17-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-3.17-beta1.jar.sha1 b/solr/licenses/poi-3.17-beta1.jar.sha1
deleted file mode 100644
index 83a318c..0000000
--- a/solr/licenses/poi-3.17-beta1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d2df762cc8301c257db1fd0f4fc2f37ed9fbbb78
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-3.17.jar.sha1 b/solr/licenses/poi-3.17.jar.sha1
new file mode 100644
index 0000000..4b5792b
--- /dev/null
+++ b/solr/licenses/poi-3.17.jar.sha1
@@ -0,0 +1 @@
+0ae92292a2043888b40d418da97dc0b669fde326
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1 b/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1
deleted file mode 100644
index f16c93f..0000000
--- a/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-96f537614c5f5ec232fb8832313280dcb93c59ab
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-ooxml-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-3.17.jar.sha1 b/solr/licenses/poi-ooxml-3.17.jar.sha1
new file mode 100644
index 0000000..b124d1e
--- /dev/null
+++ b/solr/licenses/poi-ooxml-3.17.jar.sha1
@@ -0,0 +1 @@
+07d8c44407178b73246462842bf1e206e99c8e0a
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1
deleted file mode 100644
index fc99957..0000000
--- a/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-99811dc063afea4cde813726ba6f45f724bf2c3b
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1
new file mode 100644
index 0000000..51eb0c0
--- /dev/null
+++ b/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1
@@ -0,0 +1 @@
+890114bfa82f5b6380ea0e9b0bf49b0af797b414
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1 b/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1
deleted file mode 100644
index a2b7c33..0000000
--- a/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4ad39b023c377ec534ab25205344eb79da4996b
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/poi-scratchpad-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-scratchpad-3.17.jar.sha1 b/solr/licenses/poi-scratchpad-3.17.jar.sha1
new file mode 100644
index 0000000..b23f0e8
--- /dev/null
+++ b/solr/licenses/poi-scratchpad-3.17.jar.sha1
@@ -0,0 +1 @@
+85d86a0e26c7f5c0db4ee63e8c7728e51c5d64ce
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/rome-utils-1.5.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/rome-utils-1.5.1.jar.sha1 b/solr/licenses/rome-utils-1.5.1.jar.sha1
new file mode 100644
index 0000000..bc388b9
--- /dev/null
+++ b/solr/licenses/rome-utils-1.5.1.jar.sha1
@@ -0,0 +1 @@
+3a3d6473a2f5d55fb31bf6c269af963fdea13b54
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/rome-utils-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/rome-utils-LICENSE-ASL.txt b/solr/licenses/rome-utils-LICENSE-ASL.txt
new file mode 100644
index 0000000..f43cdb1
--- /dev/null
+++ b/solr/licenses/rome-utils-LICENSE-ASL.txt
@@ -0,0 +1,14 @@
+Copyright 2004 Sun Microsystems, Inc.
+
+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.
+
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/rome-utils-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/rome-utils-NOTICE.txt b/solr/licenses/rome-utils-NOTICE.txt
new file mode 100644
index 0000000..caefccb
--- /dev/null
+++ b/solr/licenses/rome-utils-NOTICE.txt
@@ -0,0 +1 @@
+Copyright 2004 Sun Microsystems, Inc.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/slf4j-api-1.7.24.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/slf4j-api-1.7.24.jar.sha1 b/solr/licenses/slf4j-api-1.7.24.jar.sha1
new file mode 100644
index 0000000..e2722e7
--- /dev/null
+++ b/solr/licenses/slf4j-api-1.7.24.jar.sha1
@@ -0,0 +1 @@
+3f6b4bd4f8dbe8d4bea06d107a3826469b85c3e9
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/slf4j-api-1.7.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/slf4j-api-1.7.7.jar.sha1 b/solr/licenses/slf4j-api-1.7.7.jar.sha1
deleted file mode 100644
index 1a82218..0000000
--- a/solr/licenses/slf4j-api-1.7.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b8019b6249bb05d81d3a3094e468753e2b21311
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/slf4j-log4j12-1.7.24.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/slf4j-log4j12-1.7.24.jar.sha1 b/solr/licenses/slf4j-log4j12-1.7.24.jar.sha1
new file mode 100644
index 0000000..b8ec050
--- /dev/null
+++ b/solr/licenses/slf4j-log4j12-1.7.24.jar.sha1
@@ -0,0 +1 @@
+309d7b29b14573c05d4c69cc7e44da0cb17212d3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/slf4j-log4j12-1.7.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/slf4j-log4j12-1.7.7.jar.sha1 b/solr/licenses/slf4j-log4j12-1.7.7.jar.sha1
deleted file mode 100644
index c328cb3..0000000
--- a/solr/licenses/slf4j-log4j12-1.7.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58f588119ffd1702c77ccab6acb54bfb41bed8bd
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/slf4j-simple-1.7.24.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/slf4j-simple-1.7.24.jar.sha1 b/solr/licenses/slf4j-simple-1.7.24.jar.sha1
new file mode 100644
index 0000000..043482c
--- /dev/null
+++ b/solr/licenses/slf4j-simple-1.7.24.jar.sha1
@@ -0,0 +1 @@
+d9841ffd9d794ab26446df2c46a2ab2b8d2a183e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/slf4j-simple-1.7.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/slf4j-simple-1.7.7.jar.sha1 b/solr/licenses/slf4j-simple-1.7.7.jar.sha1
deleted file mode 100644
index 2da962e..0000000
--- a/solr/licenses/slf4j-simple-1.7.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8095d0b9f7e0a9cd79a663c740e0f8fb31d0e2c8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-core-1.16.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-core-1.16.jar.sha1 b/solr/licenses/tika-core-1.16.jar.sha1
deleted file mode 100644
index e8ee028..0000000
--- a/solr/licenses/tika-core-1.16.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b75cb2b65f6d014b6a3e4793835f5759168c34e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-core-1.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-core-1.17.jar.sha1 b/solr/licenses/tika-core-1.17.jar.sha1
new file mode 100644
index 0000000..684dd94
--- /dev/null
+++ b/solr/licenses/tika-core-1.17.jar.sha1
@@ -0,0 +1 @@
+b450102c2aee98107474d2f92661d947b9cef183
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-java7-1.16.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-java7-1.16.jar.sha1 b/solr/licenses/tika-java7-1.16.jar.sha1
deleted file mode 100644
index 97a229d..0000000
--- a/solr/licenses/tika-java7-1.16.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4d7dc8dd2f592824cb0fa0677d08fe9bbee2ab4
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-java7-1.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-java7-1.17.jar.sha1 b/solr/licenses/tika-java7-1.17.jar.sha1
new file mode 100644
index 0000000..c58ee42
--- /dev/null
+++ b/solr/licenses/tika-java7-1.17.jar.sha1
@@ -0,0 +1 @@
+e97e815dd1212c01b9e97d02402d57ab5bc835cc
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-parsers-1.16.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-parsers-1.16.jar.sha1 b/solr/licenses/tika-parsers-1.16.jar.sha1
deleted file mode 100644
index 4b16dde..0000000
--- a/solr/licenses/tika-parsers-1.16.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bececafbe32c013eae8d3f3cf10d28b136a6f9d7
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-parsers-1.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-parsers-1.17.jar.sha1 b/solr/licenses/tika-parsers-1.17.jar.sha1
new file mode 100644
index 0000000..e4065fe
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.17.jar.sha1
@@ -0,0 +1 @@
+4277c54fcaed542fbc8a0001fdb4c23baccc0132
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-xmp-1.16.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-xmp-1.16.jar.sha1 b/solr/licenses/tika-xmp-1.16.jar.sha1
deleted file mode 100644
index 0c4ce3a..0000000
--- a/solr/licenses/tika-xmp-1.16.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06db0bda27d4edf452c5a72a29f78805bfd23a0f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/tika-xmp-1.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-xmp-1.17.jar.sha1 b/solr/licenses/tika-xmp-1.17.jar.sha1
new file mode 100644
index 0000000..2ae91e9
--- /dev/null
+++ b/solr/licenses/tika-xmp-1.17.jar.sha1
@@ -0,0 +1 @@
+f7845ff9b484799b2c57055f7253f816e48b4f66
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/xmpcore-5.1.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/xmpcore-5.1.2.jar.sha1 b/solr/licenses/xmpcore-5.1.2.jar.sha1
deleted file mode 100644
index 19af7ca..0000000
--- a/solr/licenses/xmpcore-5.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55615fa2582424e38705487d1d3969af8554f637
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7e321d70/solr/licenses/xmpcore-5.1.3.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/xmpcore-5.1.3.jar.sha1 b/solr/licenses/xmpcore-5.1.3.jar.sha1
new file mode 100644
index 0000000..bab9957
--- /dev/null
+++ b/solr/licenses/xmpcore-5.1.3.jar.sha1
@@ -0,0 +1 @@
+57e70c3b10ff269fff9adfa7a31d61af0df30757