You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/06/18 17:22:36 UTC
lucene-solr:branch_6x: SOLR-8981: Update TIKA to 1.13: - This commit
merges branch 'SOLR-8981' of https://github.com/tballison/lucene-solr - Adds
some modifications and reverts jackcess-encrypt addition (not yet working) -
Fixes order of ivy-versions.pro
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 068d12321 -> 7403b46c4
SOLR-8981: Update TIKA to 1.13:
- This commit merges branch 'SOLR-8981' of https://github.com/tballison/lucene-solr
- Adds some modifications and reverts jackcess-encrypt addition (not yet working)
- Fixes order of ivy-versions.properties
- This closes #44
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7403b46c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7403b46c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7403b46c
Branch: refs/heads/branch_6x
Commit: 7403b46c4daacfa977d7940961418c1b1fde346e
Parents: 068d123
Author: Uwe Schindler <us...@apache.org>
Authored: Sat Jun 18 10:41:55 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sat Jun 18 19:21:52 2016 +0200
----------------------------------------------------------------------
lucene/ivy-versions.properties | 18 +-
lucene/licenses/commons-compress-1.11.jar.sha1 | 1 +
lucene/licenses/commons-compress-1.8.1.jar.sha1 | 1 -
solr/CHANGES.txt | 2 +-
solr/NOTICE.txt | 3 +
.../dataimport/TestTikaEntityProcessor.java | 2 -
solr/contrib/extraction/ivy.xml | 3 +
.../extraction/ExtractingDocumentLoader.java | 4 +-
.../ExtractingRequestHandlerTest.java | 2 -
.../morphlines/cell/SolrCellMorphlineTest.java | 2 +-
solr/licenses/commons-compress-1.11.jar.sha1 | 1 +
solr/licenses/commons-compress-1.8.1.jar.sha1 | 1 -
solr/licenses/fontbox-1.8.8.jar.sha1 | 1 -
solr/licenses/fontbox-2.0.1.jar.sha1 | 1 +
solr/licenses/isoparser-1.0.2.jar.sha1 | 1 -
solr/licenses/isoparser-1.1.18.jar.sha1 | 1 +
solr/licenses/jackcess-2.1.3.jar.sha1 | 1 +
solr/licenses/jackcess-LICENSE-ASL.txt | 507 +++++++++++++++++++
solr/licenses/jackcess-NOTICE.txt | 1 +
solr/licenses/jempbox-1.8.12.jar.sha1 | 1 +
solr/licenses/jempbox-1.8.8.jar.sha1 | 1 -
solr/licenses/metadata-extractor-2.6.2.jar.sha1 | 1 -
solr/licenses/metadata-extractor-2.8.1.jar.sha1 | 1 +
solr/licenses/pdfbox-1.8.8.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.1.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.1.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-LICENSE-ASL.txt | 314 ++++++++++++
solr/licenses/pdfbox-tools-NOTICE.txt | 14 +
solr/licenses/poi-3.11.jar.sha1 | 1 -
solr/licenses/poi-3.15-beta1.jar.sha1 | 1 +
solr/licenses/poi-ooxml-3.11.jar.sha1 | 1 -
solr/licenses/poi-ooxml-3.15-beta1.jar.sha1 | 1 +
solr/licenses/poi-ooxml-schemas-3.11.jar.sha1 | 1 -
.../poi-ooxml-schemas-3.15-beta1.jar.sha1 | 1 +
solr/licenses/poi-scratchpad-3.11.jar.sha1 | 1 -
.../licenses/poi-scratchpad-3.15-beta1.jar.sha1 | 1 +
solr/licenses/tika-core-1.13.jar.sha1 | 1 +
solr/licenses/tika-core-1.7.jar.sha1 | 1 -
solr/licenses/tika-java7-1.13.jar.sha1 | 1 +
solr/licenses/tika-java7-1.7.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.13.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.7.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.13.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.7.jar.sha1 | 1 -
solr/licenses/vorbis-java-core-0.6.jar.sha1 | 1 -
solr/licenses/vorbis-java-core-0.8.jar.sha1 | 1 +
solr/licenses/vorbis-java-tika-0.6.jar.sha1 | 1 -
solr/licenses/vorbis-java-tika-0.8.jar.sha1 | 1 +
48 files changed, 876 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a4e1bb1..1b455d5 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -18,7 +18,7 @@ com.codahale.metrics.version = 3.0.1
/com.codahale.metrics/metrics-healthchecks = ${com.codahale.metrics.version}
/com.cybozu.labs/langdetect = 1.1-20120112
-/com.drewnoakes/metadata-extractor = 2.6.2
+/com.drewnoakes/metadata-extractor = 2.8.1
/com.facebook.presto/presto-parser = 0.122
@@ -38,7 +38,8 @@ com.google.inject.guice.version = 3.0
/com.google.protobuf/protobuf-java = 2.5.0
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
-/com.googlecode.mp4parser/isoparser = 1.0.2
+/com.googlecode.mp4parser/isoparser = 1.1.18
+/com.healthmarketscience.jackcess/jackcess = 2.1.3
/com.ibm.icu/icu4j = 56.1
/com.pff/java-libpst = 0.8.1
@@ -92,7 +93,7 @@ com.sun.jersey.version = 1.9
/org.apache.ant/ant = 1.8.2
/org.apache.avro/avro = 1.7.5
-/org.apache.commons/commons-compress = 1.8.1
+/org.apache.commons/commons-compress = 1.11
/org.apache.commons/commons-exec = 1.3
/org.apache.commons/commons-math3 = 3.4.1
@@ -173,18 +174,19 @@ org.apache.james.apache.mime4j.version = 0.7.2
/org.apache.mina/mina-core = 2.0.0-M5
/org.apache.mrunit/mrunit = 1.0.0
-org.apache.pdfbox.version = 1.8.8
+org.apache.pdfbox.version = 2.0.1
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
-/org.apache.pdfbox/jempbox = ${org.apache.pdfbox.version}
+/org.apache.pdfbox/jempbox = 1.8.12
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
+/org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version}
-org.apache.poi.version = 3.11
+org.apache.poi.version = 3.15-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.7
+org.apache.tika.version = 1.13
/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}
@@ -246,7 +248,7 @@ org.eclipse.jetty.version = 9.3.8.v20160314
/org.fusesource.leveldbjni/leveldbjni = 1.8
-org.gagravarr.vorbis.java.version = 0.6
+org.gagravarr.vorbis.java.version = 0.8
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/lucene/licenses/commons-compress-1.11.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/commons-compress-1.11.jar.sha1 b/lucene/licenses/commons-compress-1.11.jar.sha1
new file mode 100644
index 0000000..89bab1e
--- /dev/null
+++ b/lucene/licenses/commons-compress-1.11.jar.sha1
@@ -0,0 +1 @@
+f43ce4c878078cbcfbb061353aa672a4c8e81443
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/lucene/licenses/commons-compress-1.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/commons-compress-1.8.1.jar.sha1 b/lucene/licenses/commons-compress-1.8.1.jar.sha1
deleted file mode 100644
index 3b1154c..0000000
--- a/lucene/licenses/commons-compress-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a698750c16740fd5b3871425f4cb3bbaa87f529d
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 00b280d..600e626 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -20,7 +20,7 @@ See the Quick Start guide at http://lucene.apache.org/solr/quickstart.html
Versions of Major Components
---------------------
-Apache Tika 1.7
+Apache Tika 1.13
Carrot2 3.12.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt
index 25e2aa3..e147285 100644
--- a/solr/NOTICE.txt
+++ b/solr/NOTICE.txt
@@ -61,6 +61,9 @@ Copyright (C) 2010-2014 James Burke, https://github.com/jrburke/requirejs
This product includes fugue icons created by Yusuke Kamiyamane
Copyright (C) 2013-2014 Yusuke Kamiyamane, https://github.com/yusukekamiyamane/fugue-icons
+Jackcess: http://jackcess.sourceforge.net/
+Copyright (C) 2011-2014 James Ahlborn
+
JavaMail API 1.5.1: https://glassfish.dev.java.net/javaee5/mail/
License: Common Development and Distribution License (CDDL) v1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
----------------------------------------------------------------------
diff --git 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
index 58b6485..fe769bc 100644
--- 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
@@ -16,7 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.lucene.util.Constants;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -105,7 +104,6 @@ public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
public static void beforeClass() throws Exception {
assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
- assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/PDFBOX-3155)", Constants.JRE_IS_MINIMUM_JAVA9);
initCore("dataimport-solrconfig.xml", "dataimport-schema-no-unique-key.xml", getFile("dihextras/solr").getAbsolutePath());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/contrib/extraction/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml
index 8fafb0a..5cf19a1 100644
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@ -32,13 +32,16 @@
<!-- When upgrading Tika, upgrade dependencies versions and add any new ones
(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="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"/>
<dependency org="org.apache.james" name="apache-mime4j-dom" rev="${/org.apache.james/apache-mime4j-dom}" conf="compile"/>
<dependency org="org.apache.commons" name="commons-compress" rev="${/org.apache.commons/commons-compress}" conf="compile"/>
<dependency org="org.apache.pdfbox" name="pdfbox" rev="${/org.apache.pdfbox/pdfbox}" conf="compile"/>
+ <dependency org="org.apache.pdfbox" name="pdfbox-tools" rev="${/org.apache.pdfbox/pdfbox-tools}" conf="compile"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
index f4040a3..cd5d4af 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
@@ -282,11 +282,13 @@ public class ExtractingDocumentLoader extends ContentStreamLoader {
/**
* Lowercases the element name, but returns null for <BR>,
* which suppresses the start-element event for lt;BR> tags.
+ * This also suppresses the <BODY> tags because those
+ * are handled internally by Tika's XHTMLContentHandler.
*/
@Override
public String mapSafeElement(String name) {
String lowerName = name.toLowerCase(Locale.ROOT);
- return lowerName.equals("br") ? null : lowerName;
+ return (lowerName.equals("br") || lowerName.equals("body")) ? null : lowerName;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
index 23ca28a..a53bcd9 100644
--- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
+++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import org.apache.lucene.util.Constants;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.ContentStream;
@@ -45,7 +44,6 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public static void beforeClass() throws Exception {
assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
- assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/PDFBOX-3155)", Constants.JRE_IS_MINIMUM_JAVA9);
initCore("solrconfig.xml", "schema.xml", getFile("extraction/solr").getAbsolutePath());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java b/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
index 2cdbd3c..4d63eed 100644
--- a/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
+++ b/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
@@ -42,7 +42,7 @@ public class SolrCellMorphlineTest extends AbstractSolrMorphlineTestBase {
@BeforeClass
public static void beforeClass2() {
assumeFalse("FIXME: Morphlines currently has issues with Windows paths", Constants.WINDOWS);
- assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/PDFBOX-3155, https://issues.apache.org/jira/browse/SOLR-8876)",
+ assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/SOLR-8876)",
Constants.JRE_IS_MINIMUM_JAVA9);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/commons-compress-1.11.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-compress-1.11.jar.sha1 b/solr/licenses/commons-compress-1.11.jar.sha1
new file mode 100644
index 0000000..89bab1e
--- /dev/null
+++ b/solr/licenses/commons-compress-1.11.jar.sha1
@@ -0,0 +1 @@
+f43ce4c878078cbcfbb061353aa672a4c8e81443
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/commons-compress-1.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-compress-1.8.1.jar.sha1 b/solr/licenses/commons-compress-1.8.1.jar.sha1
deleted file mode 100644
index 3b1154c..0000000
--- a/solr/licenses/commons-compress-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a698750c16740fd5b3871425f4cb3bbaa87f529d
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/fontbox-1.8.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/fontbox-1.8.8.jar.sha1 b/solr/licenses/fontbox-1.8.8.jar.sha1
deleted file mode 100644
index ed67d1e..0000000
--- a/solr/licenses/fontbox-1.8.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d65d291533631de29b0ee61a9527d08e24ca579a
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/fontbox-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/fontbox-2.0.1.jar.sha1 b/solr/licenses/fontbox-2.0.1.jar.sha1
new file mode 100644
index 0000000..d55b6cb
--- /dev/null
+++ b/solr/licenses/fontbox-2.0.1.jar.sha1
@@ -0,0 +1 @@
+b9d4f0993e015f3f1ce0be9e7300cf62dd7a7f15
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/isoparser-1.0.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/isoparser-1.0.2.jar.sha1 b/solr/licenses/isoparser-1.0.2.jar.sha1
deleted file mode 100644
index 0b57cdb..0000000
--- a/solr/licenses/isoparser-1.0.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6d9a5c5814ec67178dd1d5a25bae874d4697a5b8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/isoparser-1.1.18.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/isoparser-1.1.18.jar.sha1 b/solr/licenses/isoparser-1.1.18.jar.sha1
new file mode 100644
index 0000000..56ee07f
--- /dev/null
+++ b/solr/licenses/isoparser-1.1.18.jar.sha1
@@ -0,0 +1 @@
+c74bdac64b22f1e245a7657149a43437aae4a9d3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/jackcess-2.1.3.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-2.1.3.jar.sha1 b/solr/licenses/jackcess-2.1.3.jar.sha1
new file mode 100644
index 0000000..fb74a27
--- /dev/null
+++ b/solr/licenses/jackcess-2.1.3.jar.sha1
@@ -0,0 +1 @@
+fe8553847c6744d61e071ef11a6a64010731d241
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/jackcess-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-LICENSE-ASL.txt b/solr/licenses/jackcess-LICENSE-ASL.txt
new file mode 100644
index 0000000..3f40d40
--- /dev/null
+++ b/solr/licenses/jackcess-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/7403b46c/solr/licenses/jackcess-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-NOTICE.txt b/solr/licenses/jackcess-NOTICE.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/solr/licenses/jackcess-NOTICE.txt
@@ -0,0 +1 @@
+
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/jempbox-1.8.12.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jempbox-1.8.12.jar.sha1 b/solr/licenses/jempbox-1.8.12.jar.sha1
new file mode 100644
index 0000000..9882f8d
--- /dev/null
+++ b/solr/licenses/jempbox-1.8.12.jar.sha1
@@ -0,0 +1 @@
+426450c573c19f6f2c751a7a52c11931b712c9f6
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/jempbox-1.8.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jempbox-1.8.8.jar.sha1 b/solr/licenses/jempbox-1.8.8.jar.sha1
deleted file mode 100644
index c118934..0000000
--- a/solr/licenses/jempbox-1.8.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a6cd3d3bf9464a8d7f06127a4847d6b0e840fe6
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/metadata-extractor-2.6.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/metadata-extractor-2.6.2.jar.sha1 b/solr/licenses/metadata-extractor-2.6.2.jar.sha1
deleted file mode 100644
index c9f398b..0000000
--- a/solr/licenses/metadata-extractor-2.6.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-13930ff22d3f152bd969a63e88537d2f2adc2cd5
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/metadata-extractor-2.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/metadata-extractor-2.8.1.jar.sha1 b/solr/licenses/metadata-extractor-2.8.1.jar.sha1
new file mode 100644
index 0000000..d067bbf
--- /dev/null
+++ b/solr/licenses/metadata-extractor-2.8.1.jar.sha1
@@ -0,0 +1 @@
+120630f96316e0f173aedf0c88bb06c5e146ad96
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/pdfbox-1.8.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-1.8.8.jar.sha1 b/solr/licenses/pdfbox-1.8.8.jar.sha1
deleted file mode 100644
index 2c01ece..0000000
--- a/solr/licenses/pdfbox-1.8.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-520d4255b392f56124d693d72f2df61ba1172061
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/pdfbox-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-2.0.1.jar.sha1 b/solr/licenses/pdfbox-2.0.1.jar.sha1
new file mode 100644
index 0000000..a96cb90
--- /dev/null
+++ b/solr/licenses/pdfbox-2.0.1.jar.sha1
@@ -0,0 +1 @@
+dbc69649118b7eff278f228c070a40ee559e1f62
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/pdfbox-tools-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-tools-2.0.1.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.1.jar.sha1
new file mode 100644
index 0000000..a38c974
--- /dev/null
+++ b/solr/licenses/pdfbox-tools-2.0.1.jar.sha1
@@ -0,0 +1 @@
+a585a59c58f822884b1c5e56b670efa9241b699d
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/pdfbox-tools-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-tools-LICENSE-ASL.txt b/solr/licenses/pdfbox-tools-LICENSE-ASL.txt
new file mode 100644
index 0000000..d1f4d5c
--- /dev/null
+++ b/solr/licenses/pdfbox-tools-LICENSE-ASL.txt
@@ -0,0 +1,314 @@
+
+ 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.
+
+EXTERNAL COMPONENTS
+
+Apache PDFBox includes a number of components with separate copyright notices
+and license terms. Your use of these components is subject to the terms and
+conditions of the following licenses.
+
+Contributions made to the original PDFBox project:
+
+ Copyright (c) 2002-2007, www.pdfbox.org
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 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. Neither the name of pdfbox; 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 REGENTS 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.
+
+Adobe Font Metrics (AFM) for PDF Core 14 Fonts
+
+ This file and the 14 PostScript(R) AFM files it accompanies may be used,
+ copied, and distributed for any purpose and without charge, with or without
+ modification, provided that all copyright notices are retained; that the
+ AFM files are not distributed without this file; that all modifications
+ to this file or any of the AFM files are prominently noted in the modified
+ file(s); and that this paragraph is not modified. Adobe Systems has no
+ responsibility or obligation to support the use of the AFM files.
+
+CMaps for PDF Fonts (http://opensource.adobe.com/wiki/display/cmap/Downloads)
+
+ Copyright 1990-2009 Adobe Systems Incorporated.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ Neither the name of Adobe Systems Incorporated nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
+
+Glyphlist (http://www.adobe.com/devnet/opentype/archives/glyph.html)
+
+ Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this documentation file to use, copy, publish, distribute,
+ sublicense, and/or sell copies of the documentation, and to permit
+ others to do the same, provided that:
+ - No modification, editing or other alteration of this document is
+ allowed; and
+ - The above copyright notice and this permission notice shall be
+ included in all copies of the documentation.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this documentation file, to create their own derivative works
+ from the content of this document to use, copy, publish, distribute,
+ sublicense, and/or sell the derivative works, and to permit others to do
+ the same, provided that the derived work is not represented as being a
+ copy or version of this document.
+
+ Adobe shall not be liable to any party for any loss of revenue or profit
+ or for indirect, incidental, special, consequential, or other similar
+ damages, whether based on tort (including without limitation negligence
+ or strict liability), contract or other legal or equitable grounds even
+ if Adobe has been advised or had reason to know of the possibility of
+ such damages. The Adobe materials are provided on an "AS IS" basis.
+ Adobe specifically disclaims all express, statutory, or implied
+ warranties relating to the Adobe materials, including but not limited to
+ those concerning merchantability or fitness for a particular purpose or
+ non-infringement of any third party rights regarding the Adobe
+ materials.
+
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/pdfbox-tools-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-tools-NOTICE.txt b/solr/licenses/pdfbox-tools-NOTICE.txt
new file mode 100644
index 0000000..0d67b51
--- /dev/null
+++ b/solr/licenses/pdfbox-tools-NOTICE.txt
@@ -0,0 +1,14 @@
+Apache PDFBox
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Based on source code originally developed in the PDFBox, JempBox and
+FontBox projects.
+Copyright (c) 2002-2007, www.pdfbox.org
+Copyright (c) 2006-2007, www.jempbox.org
+
+Based on source code originally developed in the PaDaF project.
+Copyright (c) 2010 Atos Worldline SAS
+
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-3.11.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-3.11.jar.sha1 b/solr/licenses/poi-3.11.jar.sha1
deleted file mode 100644
index 8a24258..0000000
--- a/solr/licenses/poi-3.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-51058d9db469437a5ed0aa508e7de8937019e1d9
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-3.15-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-3.15-beta1.jar.sha1 b/solr/licenses/poi-3.15-beta1.jar.sha1
new file mode 100644
index 0000000..a6d9c5e
--- /dev/null
+++ b/solr/licenses/poi-3.15-beta1.jar.sha1
@@ -0,0 +1 @@
+048bb8326b81323631d9ceb4236cfbd382e56da2
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-ooxml-3.11.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-3.11.jar.sha1 b/solr/licenses/poi-ooxml-3.11.jar.sha1
deleted file mode 100644
index 9109cd7..0000000
--- a/solr/licenses/poi-ooxml-3.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e87975291fbb65888468b09fda2cf00e2996c2a0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1 b/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1
new file mode 100644
index 0000000..ea71044
--- /dev/null
+++ b/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1
@@ -0,0 +1 @@
+81085a47fdf0d74d473d605c6b3784e26731842e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-ooxml-schemas-3.11.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-schemas-3.11.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.11.jar.sha1
deleted file mode 100644
index a9bd3a7..0000000
--- a/solr/licenses/poi-ooxml-schemas-3.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f015e9125a65351a2e1d27c1f8c6af0ff4a34c8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1
new file mode 100644
index 0000000..6b094dd
--- /dev/null
+++ b/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1
@@ -0,0 +1 @@
+f8bc979ad79908a99483337f1ca2edf78558ac20
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-scratchpad-3.11.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-scratchpad-3.11.jar.sha1 b/solr/licenses/poi-scratchpad-3.11.jar.sha1
deleted file mode 100644
index 5a891fc..0000000
--- a/solr/licenses/poi-scratchpad-3.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5f7987f03d92bb6d01895f043915e897f7bb50a
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1 b/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1
new file mode 100644
index 0000000..5a30126
--- /dev/null
+++ b/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1
@@ -0,0 +1 @@
+f4e276aaf97a60a1156388c9e38069122b7ea914
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-core-1.13.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-core-1.13.jar.sha1 b/solr/licenses/tika-core-1.13.jar.sha1
new file mode 100644
index 0000000..90ffc56
--- /dev/null
+++ b/solr/licenses/tika-core-1.13.jar.sha1
@@ -0,0 +1 @@
+1305c798d41d1d7bbf12cb7c0ca184c98eed25ad
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-core-1.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-core-1.7.jar.sha1 b/solr/licenses/tika-core-1.7.jar.sha1
deleted file mode 100644
index 081a792..0000000
--- a/solr/licenses/tika-core-1.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee92c1d9deb07e85198fe2ff69926a7a1ce068d6
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-java7-1.13.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-java7-1.13.jar.sha1 b/solr/licenses/tika-java7-1.13.jar.sha1
new file mode 100644
index 0000000..80d5225
--- /dev/null
+++ b/solr/licenses/tika-java7-1.13.jar.sha1
@@ -0,0 +1 @@
+d6ffea1f1f76faa01509598b8a31f54b3da124cd
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-java7-1.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-java7-1.7.jar.sha1 b/solr/licenses/tika-java7-1.7.jar.sha1
deleted file mode 100644
index b2930d7..0000000
--- a/solr/licenses/tika-java7-1.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f3f7f9c82fbf5ce1c3948e1f77f1469393d5eb38
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-parsers-1.13.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-parsers-1.13.jar.sha1 b/solr/licenses/tika-parsers-1.13.jar.sha1
new file mode 100644
index 0000000..6e704e7
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.13.jar.sha1
@@ -0,0 +1 @@
+374fde67b9d35f785534b0e6c4953533c31bab5f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-parsers-1.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-parsers-1.7.jar.sha1 b/solr/licenses/tika-parsers-1.7.jar.sha1
deleted file mode 100644
index 8b9886d..0000000
--- a/solr/licenses/tika-parsers-1.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ae2a0cdac649cf9baab01156c75a655cf50ca936
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-xmp-1.13.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-xmp-1.13.jar.sha1 b/solr/licenses/tika-xmp-1.13.jar.sha1
new file mode 100644
index 0000000..38942cd
--- /dev/null
+++ b/solr/licenses/tika-xmp-1.13.jar.sha1
@@ -0,0 +1 @@
+1d73457bcc68ba7df72833baa40b29c39ce4a67e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/tika-xmp-1.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-xmp-1.7.jar.sha1 b/solr/licenses/tika-xmp-1.7.jar.sha1
deleted file mode 100644
index 01b88b6..0000000
--- a/solr/licenses/tika-xmp-1.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ac7b48998ffbafa98467ed075ab5f8efb688bebc
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/vorbis-java-core-0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/vorbis-java-core-0.6.jar.sha1 b/solr/licenses/vorbis-java-core-0.6.jar.sha1
deleted file mode 100644
index 306f7da..0000000
--- a/solr/licenses/vorbis-java-core-0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-71deedbdfe6a1b0dcadd6c5ae335e3e9b427524c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/vorbis-java-core-0.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/vorbis-java-core-0.8.jar.sha1 b/solr/licenses/vorbis-java-core-0.8.jar.sha1
new file mode 100644
index 0000000..dbff784
--- /dev/null
+++ b/solr/licenses/vorbis-java-core-0.8.jar.sha1
@@ -0,0 +1 @@
+7e9937c2575cda2e3fc116415117c74f23e43fa6
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/vorbis-java-tika-0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/vorbis-java-tika-0.6.jar.sha1 b/solr/licenses/vorbis-java-tika-0.6.jar.sha1
deleted file mode 100644
index 8ea612e..0000000
--- a/solr/licenses/vorbis-java-tika-0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-be5b08ff4c45632975646f286a1d13e325bec59a
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7403b46c/solr/licenses/vorbis-java-tika-0.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/vorbis-java-tika-0.8.jar.sha1 b/solr/licenses/vorbis-java-tika-0.8.jar.sha1
new file mode 100644
index 0000000..2b634bb
--- /dev/null
+++ b/solr/licenses/vorbis-java-tika-0.8.jar.sha1
@@ -0,0 +1 @@
+4ddbb27ac5884a0f0398a63d46a89d3bc87dc457