diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 8d7cce06d96..93e9ada648e 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -15,32 +15,32 @@ com.carrotsearch.randomizedtesting.version = 2.7.2
/com.cybozu.labs/langdetect = 1.1-20120112
/com.drewnoakes/metadata-extractor = 2.11.0
-/com.epam/parso = 2.0.9
+/com.epam/parso = 2.0.11
-com.fasterxml.jackson.core.version = 2.10.0
+com.fasterxml.jackson.core.version = 2.10.1
/com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version}
/com.fasterxml.jackson.core/jackson-core = ${com.fasterxml.jackson.core.version}
/com.fasterxml.jackson.core/jackson-databind = ${com.fasterxml.jackson.core.version}
/com.fasterxml.jackson.dataformat/jackson-dataformat-smile = ${com.fasterxml.jackson.core.version}
/com.github.ben-manes.caffeine/caffeine = 2.8.0
-/com.github.virtuald/curvesapi = 1.04
+/com.github.virtuald/curvesapi = 1.06
/com.github.zafarkhaja/java-semver = 0.9.0
/com.google.guava/guava = 25.1-jre
-/com.google.protobuf/protobuf-java = 3.6.1
+/com.google.protobuf/protobuf-java = 3.11.0
/com.google.re2j/re2j = 1.2
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
/com.googlecode.mp4parser/isoparser = 1.1.22
-/com.healthmarketscience.jackcess/jackcess = 2.1.12
-/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
+/com.healthmarketscience.jackcess/jackcess = 3.0.1
+/com.healthmarketscience.jackcess/jackcess-encrypt = 3.0.0
/com.ibm.icu/icu4j = 62.1
/com.jayway.jsonpath/json-path = 2.4.0
/com.lmax/disruptor = 3.4.2
/com.pff/java-libpst = 0.8.1
-com.rometools.version = 1.5.1
+com.rometools.version = 1.12.2
/com.rometools/rome = ${com.rometools.version}
/com.rometools/rome-utils = ${com.rometools.version}
@@ -55,10 +55,10 @@ com.sun.jersey.version = 1.19
/com.tdunning/t-digest = 3.1
/com.vaadin.external.google/android-json = 0.0.20131108.vaadin1
/commons-cli/commons-cli = 1.2
-/commons-codec/commons-codec = 1.11
+/commons-codec/commons-codec = 1.13
/commons-collections/commons-collections = 3.2.2
/commons-fileupload/commons-fileupload = 1.3.3
-/commons-io/commons-io = 2.5
+/commons-io/commons-io = 2.6
/commons-logging/commons-logging = 1.1.3
/de.l3s.boilerpipe/boilerpipe = 1.1.0
@@ -128,10 +128,11 @@ org.apache.calcite.version = 1.18.0
/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
/org.apache.commons/commons-collections4 = 4.2
-/org.apache.commons/commons-compress = 1.18
+/org.apache.commons/commons-compress = 1.19
/org.apache.commons/commons-configuration2 = 2.1.1
+/org.apache.commons/commons-csv = 1.7
/org.apache.commons/commons-exec = 1.3
-/org.apache.commons/commons-lang3 = 3.8.1
+/org.apache.commons/commons-lang3 = 3.9
/org.apache.commons/commons-math3 = 3.6.1
/org.apache.commons/commons-text = 1.6
@@ -155,13 +156,13 @@ org.apache.hadoop.version = 3.2.0
# The httpcore version is often different from the httpclient and httpmime versions,
# so the httpcore version value should not share the same symbolic name with them.
-/org.apache.httpcomponents/httpclient = 4.5.6
-/org.apache.httpcomponents/httpcore = 4.4.10
-/org.apache.httpcomponents/httpmime = 4.5.6
+/org.apache.httpcomponents/httpclient = 4.5.10
+/org.apache.httpcomponents/httpcore = 4.4.12
+/org.apache.httpcomponents/httpmime = 4.5.10
/org.apache.ivy/ivy = 2.4.0
-org.apache.james.apache.mime4j.version = 0.8.2
+org.apache.james.apache.mime4j.version = 0.8.3
/org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j.version}
/org.apache.james/apache-mime4j-dom = ${org.apache.james.apache.mime4j.version}
@@ -191,13 +192,13 @@ org.apache.logging.log4j.version = 2.11.2
/org.apache.opennlp/opennlp-tools = 1.9.1
-org.apache.pdfbox.version = 2.0.12
+org.apache.pdfbox.version = 2.0.17
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/jempbox = 1.8.16
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version}
-org.apache.poi.version = 4.0.0
+org.apache.poi.version = 4.1.1
/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}
@@ -206,7 +207,7 @@ org.apache.poi.version = 4.0.0
org.apache.thrift.version = 0.12.0
/org.apache.thrift/libthrift = ${org.apache.thrift.version}
-org.apache.tika.version = 1.19.1
+org.apache.tika.version = 1.23
/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}
@@ -219,7 +220,7 @@ org.apache.velocity.tools.version = 3.0
/org.apache.velocity/velocity-engine-core = 2.0
-/org.apache.xmlbeans/xmlbeans = 3.0.1
+/org.apache.xmlbeans/xmlbeans = 3.1.0
org.apache.zookeeper.version = 3.5.5
/org.apache.zookeeper/zookeeper = ${org.apache.zookeeper.version}
@@ -234,7 +235,7 @@ org.apache.zookeeper.version = 3.5.5
/org.bitbucket.b_c/jose4j = 0.6.5
-org.bouncycastle.version = 1.60
+org.bouncycastle.version = 1.64
/org.bouncycastle/bcmail-jdk15on = ${org.bouncycastle.version}
/org.bouncycastle/bcpkix-jdk15on = ${org.bouncycastle.version}
/org.bouncycastle/bcprov-jdk15on = ${org.bouncycastle.version}
@@ -295,7 +296,7 @@ org.gagravarr.vorbis.java.version = 0.8
/org.hsqldb/hsqldb = 2.4.0
/org.jdom/jdom2 = 2.0.6
-/org.jsoup/jsoup = 1.11.3
+/org.jsoup/jsoup = 1.12.1
/org.locationtech.jts/jts-core = 1.15.0
/org.locationtech.spatial4j/spatial4j = 0.7
@@ -304,7 +305,7 @@ org.gagravarr.vorbis.java.version = 0.8
/org.objenesis/objenesis = 2.6
-org.ow2.asm.version = 5.1
+org.ow2.asm.version = 7.2
/org.ow2.asm/asm = ${org.ow2.asm.version}
/org.ow2.asm/asm-commons = ${org.ow2.asm.version}
@@ -326,4 +327,4 @@ org.slf4j.version = 1.7.24
ua.net.nlp.morfologik-ukrainian-search.version = 3.9.0
/ua.net.nlp/morfologik-ukrainian-search = ${ua.net.nlp.morfologik-ukrainian-search.version}
-/xerces/xercesImpl = 2.9.1
+/xerces/xercesImpl = 2.12.0
diff --git a/lucene/licenses/asm-5.1.jar.sha1 b/lucene/licenses/asm-5.1.jar.sha1
deleted file mode 100644
index fc907c77de4..00000000000
--- a/lucene/licenses/asm-5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45
diff --git a/lucene/licenses/asm-7.2.jar.sha1 b/lucene/licenses/asm-7.2.jar.sha1
new file mode 100644
index 00000000000..ccb16fac6a0
--- /dev/null
+++ b/lucene/licenses/asm-7.2.jar.sha1
@@ -0,0 +1 @@
+fa637eb67eb7628c915d73762b681ae7ff0b9731
diff --git a/lucene/licenses/asm-commons-5.1.jar.sha1 b/lucene/licenses/asm-commons-5.1.jar.sha1
deleted file mode 100644
index 8b495938409..00000000000
--- a/lucene/licenses/asm-commons-5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25d8a575034dd9cfcb375a39b5334f0ba9c8474e
diff --git a/lucene/licenses/asm-commons-7.2.jar.sha1 b/lucene/licenses/asm-commons-7.2.jar.sha1
new file mode 100644
index 00000000000..3db5daccb9b
--- /dev/null
+++ b/lucene/licenses/asm-commons-7.2.jar.sha1
@@ -0,0 +1 @@
+ca2954e8d92a05bacc28ff465b25c70e0f512497
diff --git a/lucene/licenses/commons-codec-1.11.jar.sha1 b/lucene/licenses/commons-codec-1.11.jar.sha1
deleted file mode 100644
index 0ca984151b5..00000000000
--- a/lucene/licenses/commons-codec-1.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3acb4705652e16236558f0f4f2192cc33c3bd189
diff --git a/lucene/licenses/commons-codec-1.13.jar.sha1 b/lucene/licenses/commons-codec-1.13.jar.sha1
new file mode 100644
index 00000000000..4d9344b4a4e
--- /dev/null
+++ b/lucene/licenses/commons-codec-1.13.jar.sha1
@@ -0,0 +1 @@
+3f18e1aa31031d89db6f01ba05d501258ce69d2c
diff --git a/lucene/licenses/commons-compress-1.18.jar.sha1 b/lucene/licenses/commons-compress-1.18.jar.sha1
deleted file mode 100644
index 96fa37315b4..00000000000
--- a/lucene/licenses/commons-compress-1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5
diff --git a/lucene/licenses/commons-compress-1.19.jar.sha1 b/lucene/licenses/commons-compress-1.19.jar.sha1
new file mode 100644
index 00000000000..54494ea07df
--- /dev/null
+++ b/lucene/licenses/commons-compress-1.19.jar.sha1
@@ -0,0 +1 @@
+7e65777fb451ddab6a9c054beb879e521b7eab78
diff --git a/lucene/licenses/httpclient-4.5.10.jar.sha1 b/lucene/licenses/httpclient-4.5.10.jar.sha1
new file mode 100644
index 00000000000..f50700699c1
--- /dev/null
+++ b/lucene/licenses/httpclient-4.5.10.jar.sha1
@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5
diff --git a/lucene/licenses/httpclient-4.5.6.jar.sha1 b/lucene/licenses/httpclient-4.5.6.jar.sha1
deleted file mode 100644
index 92b233e916a..00000000000
--- a/lucene/licenses/httpclient-4.5.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1afe5621985efe90a92d0fbc9be86271efbe796f
diff --git a/lucene/licenses/httpcore-4.4.10.jar.sha1 b/lucene/licenses/httpcore-4.4.10.jar.sha1
deleted file mode 100644
index 6f915469a6c..00000000000
--- a/lucene/licenses/httpcore-4.4.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-acc54d9b28bdffe4bbde89ed2e4a1e86b5285e2b
diff --git a/lucene/licenses/httpcore-4.4.12.jar.sha1 b/lucene/licenses/httpcore-4.4.12.jar.sha1
new file mode 100644
index 00000000000..2a062f3c442
--- /dev/null
+++ b/lucene/licenses/httpcore-4.4.12.jar.sha1
@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132
diff --git a/lucene/licenses/xercesImpl-2.12.0.jar.sha1 b/lucene/licenses/xercesImpl-2.12.0.jar.sha1
new file mode 100644
index 00000000000..551df5cdd53
--- /dev/null
+++ b/lucene/licenses/xercesImpl-2.12.0.jar.sha1
@@ -0,0 +1 @@
+f02c844149fd306601f20e0b34853a670bef7fa2
diff --git a/lucene/licenses/xercesImpl-2.9.1.jar.sha1 b/lucene/licenses/xercesImpl-2.9.1.jar.sha1
deleted file mode 100644
index 86ebad92633..00000000000
--- a/lucene/licenses/xercesImpl-2.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7746dbbfdb0..e5cfa9c5cb7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -22,7 +22,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
Versions of Major Components
---------------------
-Apache Tika 1.19.1
+Apache Tika 1.23
Carrot2 3.16.0
Velocity 2.0 and Velocity Tools 3.0
Apache ZooKeeper 3.5.5
@@ -53,8 +53,9 @@ Bug Fixes
Other Changes
---------------------
-SOLR-14047: Make sure tests don't pickup other Hadoop installs (Kevin Risden)
+* SOLR-14047: Make sure tests don't pickup other Hadoop installs (Kevin Risden)
+* SOLR-14054: Upgrade to Tika 1.23 when available (Tim Allison)
================== 8.4.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml
index ec9483d5e1e..fb95664d4da 100644
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@ -53,6 +53,7 @@
+
diff --git a/solr/core/src/java/org/apache/solr/handler/CatStream.java b/solr/core/src/java/org/apache/solr/handler/CatStream.java
index 6a4752e6673..7dc10a115c9 100644
--- a/solr/core/src/java/org/apache/solr/handler/CatStream.java
+++ b/solr/core/src/java/org/apache/solr/handler/CatStream.java
@@ -220,7 +220,7 @@ public class CatStream extends TupleStream implements Expressible {
return Paths.get(chroot, pathRelativeToChroot).toString();
}
- private void closeCurrentFileIfSet() {
+ private void closeCurrentFileIfSet() throws IOException {
if (currentFilePath != null) {
currentFileLines.close();
currentFilePath = null;
diff --git a/solr/licenses/apache-mime4j-core-0.8.2.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.2.jar.sha1
deleted file mode 100644
index 6afc490d74d..00000000000
--- a/solr/licenses/apache-mime4j-core-0.8.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-94919d81969c67c5894646338bf10fbc35f5a946
diff --git a/solr/licenses/apache-mime4j-core-0.8.3.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.3.jar.sha1
new file mode 100644
index 00000000000..7fa45b639b3
--- /dev/null
+++ b/solr/licenses/apache-mime4j-core-0.8.3.jar.sha1
@@ -0,0 +1 @@
+1179b56c9919c1a8e20d3a528ee4c6cee19bcbe0
diff --git a/solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1
deleted file mode 100644
index 171a9d1cef5..00000000000
--- a/solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-32c9a9afe84eca86a3b0b3c66a956ced249ceade
diff --git a/solr/licenses/apache-mime4j-dom-0.8.3.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.3.jar.sha1
new file mode 100644
index 00000000000..70163a52c51
--- /dev/null
+++ b/solr/licenses/apache-mime4j-dom-0.8.3.jar.sha1
@@ -0,0 +1 @@
+e80733714eb6a70895bfc74a9528c658504c2c83
diff --git a/solr/licenses/asm-5.1.jar.sha1 b/solr/licenses/asm-5.1.jar.sha1
deleted file mode 100644
index fc907c77de4..00000000000
--- a/solr/licenses/asm-5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45
diff --git a/solr/licenses/asm-7.2.jar.sha1 b/solr/licenses/asm-7.2.jar.sha1
new file mode 100644
index 00000000000..ccb16fac6a0
--- /dev/null
+++ b/solr/licenses/asm-7.2.jar.sha1
@@ -0,0 +1 @@
+fa637eb67eb7628c915d73762b681ae7ff0b9731
diff --git a/solr/licenses/asm-commons-5.1.jar.sha1 b/solr/licenses/asm-commons-5.1.jar.sha1
deleted file mode 100644
index 8b495938409..00000000000
--- a/solr/licenses/asm-commons-5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25d8a575034dd9cfcb375a39b5334f0ba9c8474e
diff --git a/solr/licenses/asm-commons-7.2.jar.sha1 b/solr/licenses/asm-commons-7.2.jar.sha1
new file mode 100644
index 00000000000..3db5daccb9b
--- /dev/null
+++ b/solr/licenses/asm-commons-7.2.jar.sha1
@@ -0,0 +1 @@
+ca2954e8d92a05bacc28ff465b25c70e0f512497
diff --git a/solr/licenses/bcmail-jdk15on-1.60.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.60.jar.sha1
deleted file mode 100644
index 9cb6092c793..00000000000
--- a/solr/licenses/bcmail-jdk15on-1.60.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df0250131a6e85e546ec5b1bf964f7f2ff3a42fc
diff --git a/solr/licenses/bcmail-jdk15on-1.64.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.64.jar.sha1
new file mode 100644
index 00000000000..aa3ef0cdb77
--- /dev/null
+++ b/solr/licenses/bcmail-jdk15on-1.64.jar.sha1
@@ -0,0 +1 @@
+7a2601f0a1d336966cca03edb04a69ba0f5f25d9
diff --git a/solr/licenses/bcpkix-jdk15on-1.60.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.60.jar.sha1
deleted file mode 100644
index 45e955aacaa..00000000000
--- a/solr/licenses/bcpkix-jdk15on-1.60.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0c46320fbc07be3a24eb13a56cee4e3d38e0c75
diff --git a/solr/licenses/bcpkix-jdk15on-1.64.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.64.jar.sha1
new file mode 100644
index 00000000000..e102196d7a7
--- /dev/null
+++ b/solr/licenses/bcpkix-jdk15on-1.64.jar.sha1
@@ -0,0 +1 @@
+3dac163e20110817d850d17e0444852a6d7d0bd7
diff --git a/solr/licenses/bcprov-jdk15on-1.60.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.60.jar.sha1
deleted file mode 100644
index 3fc67c7c964..00000000000
--- a/solr/licenses/bcprov-jdk15on-1.60.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bd47ad3bd14b8e82595c7adaa143501e60842a84
diff --git a/solr/licenses/bcprov-jdk15on-1.64.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.64.jar.sha1
new file mode 100644
index 00000000000..7d8758789bb
--- /dev/null
+++ b/solr/licenses/bcprov-jdk15on-1.64.jar.sha1
@@ -0,0 +1 @@
+1467dac1b787b5ad2a18201c0c281df69882259e
diff --git a/solr/licenses/commons-codec-1.11.jar.sha1 b/solr/licenses/commons-codec-1.11.jar.sha1
deleted file mode 100644
index 0ca984151b5..00000000000
--- a/solr/licenses/commons-codec-1.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3acb4705652e16236558f0f4f2192cc33c3bd189
diff --git a/solr/licenses/commons-codec-1.13.jar.sha1 b/solr/licenses/commons-codec-1.13.jar.sha1
new file mode 100644
index 00000000000..4d9344b4a4e
--- /dev/null
+++ b/solr/licenses/commons-codec-1.13.jar.sha1
@@ -0,0 +1 @@
+3f18e1aa31031d89db6f01ba05d501258ce69d2c
diff --git a/solr/licenses/commons-compress-1.18.jar.sha1 b/solr/licenses/commons-compress-1.18.jar.sha1
deleted file mode 100644
index 96fa37315b4..00000000000
--- a/solr/licenses/commons-compress-1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5
diff --git a/solr/licenses/commons-compress-1.19.jar.sha1 b/solr/licenses/commons-compress-1.19.jar.sha1
new file mode 100644
index 00000000000..54494ea07df
--- /dev/null
+++ b/solr/licenses/commons-compress-1.19.jar.sha1
@@ -0,0 +1 @@
+7e65777fb451ddab6a9c054beb879e521b7eab78
diff --git a/solr/licenses/commons-csv-1.7.jar.sha1 b/solr/licenses/commons-csv-1.7.jar.sha1
new file mode 100644
index 00000000000..da1d977e1a5
--- /dev/null
+++ b/solr/licenses/commons-csv-1.7.jar.sha1
@@ -0,0 +1 @@
+cb5d05520f8fe1b409aaf29962e47dc5764f8f39
diff --git a/solr/licenses/commons-csv-LICENSE-ASL.txt b/solr/licenses/commons-csv-LICENSE-ASL.txt
new file mode 100644
index 00000000000..d6456956733
--- /dev/null
+++ b/solr/licenses/commons-csv-LICENSE-ASL.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/solr/licenses/commons-csv-NOTICE.txt b/solr/licenses/commons-csv-NOTICE.txt
new file mode 100644
index 00000000000..22bd8880f69
--- /dev/null
+++ b/solr/licenses/commons-csv-NOTICE.txt
@@ -0,0 +1,9 @@
+Apache Commons CSV
+
+Copyright 2001-2008 The Apache Software Foundation
+
+
+
+This product includes software developed by
+
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/solr/licenses/commons-io-2.5.jar.sha1 b/solr/licenses/commons-io-2.5.jar.sha1
deleted file mode 100644
index 4c14fb660fb..00000000000
--- a/solr/licenses/commons-io-2.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2852e6e05fbb95076fc091f6d1780f1f8fe35e0f
diff --git a/solr/licenses/commons-io-2.6.jar.sha1 b/solr/licenses/commons-io-2.6.jar.sha1
new file mode 100644
index 00000000000..9fa55f50835
--- /dev/null
+++ b/solr/licenses/commons-io-2.6.jar.sha1
@@ -0,0 +1 @@
+815893df5f31da2ece4040fe0a12fd44b577afaf
diff --git a/solr/licenses/commons-lang3-3.8.1.jar.sha1 b/solr/licenses/commons-lang3-3.8.1.jar.sha1
deleted file mode 100644
index bbed0fbdeb3..00000000000
--- a/solr/licenses/commons-lang3-3.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6505a72a097d9270f7a9e7bf42c4238283247755
diff --git a/solr/licenses/commons-lang3-3.9.jar.sha1 b/solr/licenses/commons-lang3-3.9.jar.sha1
new file mode 100644
index 00000000000..7875e4380d2
--- /dev/null
+++ b/solr/licenses/commons-lang3-3.9.jar.sha1
@@ -0,0 +1 @@
+0122c7cee69b53ed4a7681c03d4ee4c0e2765da5
diff --git a/solr/licenses/curvesapi-1.04.jar.sha1 b/solr/licenses/curvesapi-1.04.jar.sha1
deleted file mode 100644
index 51c26262806..00000000000
--- a/solr/licenses/curvesapi-1.04.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3386abf821719bc89c7685f9eaafaf4a842f0199
diff --git a/solr/licenses/curvesapi-1.06.jar.sha1 b/solr/licenses/curvesapi-1.06.jar.sha1
new file mode 100644
index 00000000000..e6cb5c3d118
--- /dev/null
+++ b/solr/licenses/curvesapi-1.06.jar.sha1
@@ -0,0 +1 @@
+159dd2e8956459a4eb0a9a6ecda9004d8d289708
diff --git a/solr/licenses/fontbox-2.0.12.jar.sha1 b/solr/licenses/fontbox-2.0.12.jar.sha1
deleted file mode 100644
index 8ded8ca0a9d..00000000000
--- a/solr/licenses/fontbox-2.0.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-566fd1d6b25012bb82078da08b82e6d0ba8c884a
diff --git a/solr/licenses/fontbox-2.0.17.jar.sha1 b/solr/licenses/fontbox-2.0.17.jar.sha1
new file mode 100644
index 00000000000..eab3309e719
--- /dev/null
+++ b/solr/licenses/fontbox-2.0.17.jar.sha1
@@ -0,0 +1 @@
+d42c5eda5b232866a230c36a26fc22ae6e966ffa
diff --git a/solr/licenses/httpclient-4.5.10.jar.sha1 b/solr/licenses/httpclient-4.5.10.jar.sha1
new file mode 100644
index 00000000000..f50700699c1
--- /dev/null
+++ b/solr/licenses/httpclient-4.5.10.jar.sha1
@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5
diff --git a/solr/licenses/httpclient-4.5.6.jar.sha1 b/solr/licenses/httpclient-4.5.6.jar.sha1
deleted file mode 100644
index 92b233e916a..00000000000
--- a/solr/licenses/httpclient-4.5.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1afe5621985efe90a92d0fbc9be86271efbe796f
diff --git a/solr/licenses/httpcore-4.4.10.jar.sha1 b/solr/licenses/httpcore-4.4.10.jar.sha1
deleted file mode 100644
index 6f915469a6c..00000000000
--- a/solr/licenses/httpcore-4.4.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-acc54d9b28bdffe4bbde89ed2e4a1e86b5285e2b
diff --git a/solr/licenses/httpcore-4.4.12.jar.sha1 b/solr/licenses/httpcore-4.4.12.jar.sha1
new file mode 100644
index 00000000000..2a062f3c442
--- /dev/null
+++ b/solr/licenses/httpcore-4.4.12.jar.sha1
@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132
diff --git a/solr/licenses/httpmime-4.5.10.jar.sha1 b/solr/licenses/httpmime-4.5.10.jar.sha1
new file mode 100644
index 00000000000..473e6604f21
--- /dev/null
+++ b/solr/licenses/httpmime-4.5.10.jar.sha1
@@ -0,0 +1 @@
+3513ca10d24d7aa962741c90e914fec650f0848c
diff --git a/solr/licenses/httpmime-4.5.6.jar.sha1 b/solr/licenses/httpmime-4.5.6.jar.sha1
deleted file mode 100644
index eba7d66ef2c..00000000000
--- a/solr/licenses/httpmime-4.5.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-164343da11db817e81e24e0d9869527e069850c9
diff --git a/solr/licenses/jackcess-2.1.12.jar.sha1 b/solr/licenses/jackcess-2.1.12.jar.sha1
deleted file mode 100644
index 49fe42146ff..00000000000
--- a/solr/licenses/jackcess-2.1.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a422b016925475b2234b576a0f7ee3f55f1f9e2
diff --git a/solr/licenses/jackcess-3.0.1.jar.sha1 b/solr/licenses/jackcess-3.0.1.jar.sha1
new file mode 100644
index 00000000000..6e3492e06ab
--- /dev/null
+++ b/solr/licenses/jackcess-3.0.1.jar.sha1
@@ -0,0 +1 @@
+e753ed760d06a0b6849c02d3d4c603ae6c8e05c8
diff --git a/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1 b/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
deleted file mode 100644
index b0153ecf995..00000000000
--- a/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfe7134b759597276ff87b7acf662bef1c1c4fd8
diff --git a/solr/licenses/jackcess-encrypt-3.0.0.jar.sha1 b/solr/licenses/jackcess-encrypt-3.0.0.jar.sha1
new file mode 100644
index 00000000000..2b1f23aa822
--- /dev/null
+++ b/solr/licenses/jackcess-encrypt-3.0.0.jar.sha1
@@ -0,0 +1 @@
+24ee9302d731e7c66e828049bb055ca710e29f03
diff --git a/solr/licenses/jackson-annotations-2.10.0.jar.sha1 b/solr/licenses/jackson-annotations-2.10.0.jar.sha1
deleted file mode 100644
index bbfd7ceadf0..00000000000
--- a/solr/licenses/jackson-annotations-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e01cfd93b80d6773b3f757c78e756c9755b47b81
diff --git a/solr/licenses/jackson-annotations-2.10.1.jar.sha1 b/solr/licenses/jackson-annotations-2.10.1.jar.sha1
new file mode 100644
index 00000000000..c9a88a5590c
--- /dev/null
+++ b/solr/licenses/jackson-annotations-2.10.1.jar.sha1
@@ -0,0 +1 @@
+54d72475c0d6819f2d0e9a09d25c3ed876a4972f
diff --git a/solr/licenses/jackson-core-2.10.0.jar.sha1 b/solr/licenses/jackson-core-2.10.0.jar.sha1
deleted file mode 100644
index 6511c3aa3d7..00000000000
--- a/solr/licenses/jackson-core-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e2c5fa04648ec9772c63e2101c53af6504e624e
diff --git a/solr/licenses/jackson-core-2.10.1.jar.sha1 b/solr/licenses/jackson-core-2.10.1.jar.sha1
new file mode 100644
index 00000000000..f37bc69b7d6
--- /dev/null
+++ b/solr/licenses/jackson-core-2.10.1.jar.sha1
@@ -0,0 +1 @@
+2c8b5e26ba40e5f91eb37a24075a2028b402c5f9
diff --git a/solr/licenses/jackson-databind-2.10.0.jar.sha1 b/solr/licenses/jackson-databind-2.10.0.jar.sha1
deleted file mode 100644
index e7b7c74873f..00000000000
--- a/solr/licenses/jackson-databind-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1127c9cf62f2bb3121a3a2a0a1351d251a602117
diff --git a/solr/licenses/jackson-databind-2.10.1.jar.sha1 b/solr/licenses/jackson-databind-2.10.1.jar.sha1
new file mode 100644
index 00000000000..20ded48b3a9
--- /dev/null
+++ b/solr/licenses/jackson-databind-2.10.1.jar.sha1
@@ -0,0 +1 @@
+18eee15ffc662d27538d5b6ee84e4c92c0a9d03e
diff --git a/solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1
deleted file mode 100644
index 342621d7216..00000000000
--- a/solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e761e9b93d2da05e5ea1bc4deff1d75cb13b106b
diff --git a/solr/licenses/jackson-dataformat-smile-2.10.1.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.10.1.jar.sha1
new file mode 100644
index 00000000000..87329cbe77b
--- /dev/null
+++ b/solr/licenses/jackson-dataformat-smile-2.10.1.jar.sha1
@@ -0,0 +1 @@
+25e686e7821de741d7ac80921be1eb0224b935ed
diff --git a/solr/licenses/jsoup-1.11.3.jar.sha1 b/solr/licenses/jsoup-1.11.3.jar.sha1
deleted file mode 100644
index 1b814dcba23..00000000000
--- a/solr/licenses/jsoup-1.11.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-36da09a8f68484523fa2aaa100399d612b247d67
diff --git a/solr/licenses/jsoup-1.12.1.jar.sha1 b/solr/licenses/jsoup-1.12.1.jar.sha1
new file mode 100644
index 00000000000..8228f219314
--- /dev/null
+++ b/solr/licenses/jsoup-1.12.1.jar.sha1
@@ -0,0 +1 @@
+55819a28fc834c2f2bcf4dcdb278524dc3cf088f
diff --git a/solr/licenses/parso-2.0.11.jar.sha1 b/solr/licenses/parso-2.0.11.jar.sha1
new file mode 100644
index 00000000000..9f5825846a2
--- /dev/null
+++ b/solr/licenses/parso-2.0.11.jar.sha1
@@ -0,0 +1 @@
+3cd3dde9ace470e102bb344e05467ce308108a8e
diff --git a/solr/licenses/parso-2.0.9.jar.sha1 b/solr/licenses/parso-2.0.9.jar.sha1
deleted file mode 100644
index d292e7ef7da..00000000000
--- a/solr/licenses/parso-2.0.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-615d910051b7c4695397e6686cf840caf6216e19
diff --git a/solr/licenses/pdfbox-2.0.12.jar.sha1 b/solr/licenses/pdfbox-2.0.12.jar.sha1
deleted file mode 100644
index d190b7e2302..00000000000
--- a/solr/licenses/pdfbox-2.0.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7311cd267c19e1ba8154b076a63d29537154784
diff --git a/solr/licenses/pdfbox-2.0.17.jar.sha1 b/solr/licenses/pdfbox-2.0.17.jar.sha1
new file mode 100644
index 00000000000..564aded5fb5
--- /dev/null
+++ b/solr/licenses/pdfbox-2.0.17.jar.sha1
@@ -0,0 +1 @@
+b5c8dff799bd967c70ccae75e6972327ae640d35
diff --git a/solr/licenses/pdfbox-tools-2.0.12.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.12.jar.sha1
deleted file mode 100644
index 226084a79da..00000000000
--- a/solr/licenses/pdfbox-tools-2.0.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e4569e8364f33be1c0af889f62b0f8f4dca7d45
diff --git a/solr/licenses/pdfbox-tools-2.0.17.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.17.jar.sha1
new file mode 100644
index 00000000000..1b34393bf70
--- /dev/null
+++ b/solr/licenses/pdfbox-tools-2.0.17.jar.sha1
@@ -0,0 +1 @@
+bd30eb8fc24a7cf903044105ff2df4fb793a454e
diff --git a/solr/licenses/poi-4.0.0.jar.sha1 b/solr/licenses/poi-4.0.0.jar.sha1
deleted file mode 100644
index 503cc5bbe65..00000000000
--- a/solr/licenses/poi-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7ddb9b983ed682c93a986e8bb596d5935b13086c
diff --git a/solr/licenses/poi-4.1.1.jar.sha1 b/solr/licenses/poi-4.1.1.jar.sha1
new file mode 100644
index 00000000000..dd34cff0dfc
--- /dev/null
+++ b/solr/licenses/poi-4.1.1.jar.sha1
@@ -0,0 +1 @@
+c915f1a426213a8450fb473b5b3adb63f5ac1017
diff --git a/solr/licenses/poi-ooxml-4.0.0.jar.sha1 b/solr/licenses/poi-ooxml-4.0.0.jar.sha1
deleted file mode 100644
index 82f38e8f1c0..00000000000
--- a/solr/licenses/poi-ooxml-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f3fa9c2bd64eb3ec15378de960a07d077ae5b26d
diff --git a/solr/licenses/poi-ooxml-4.1.1.jar.sha1 b/solr/licenses/poi-ooxml-4.1.1.jar.sha1
new file mode 100644
index 00000000000..b6210030f2f
--- /dev/null
+++ b/solr/licenses/poi-ooxml-4.1.1.jar.sha1
@@ -0,0 +1 @@
+216d8bb4c064c3a1079e77d693cd60346dd63f38
diff --git a/solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1 b/solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1
deleted file mode 100644
index 6edf823b89c..00000000000
--- a/solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-125f9ccd2cf652fa4169b1c30e9023362e23324f
diff --git a/solr/licenses/poi-ooxml-schemas-4.1.1.jar.sha1 b/solr/licenses/poi-ooxml-schemas-4.1.1.jar.sha1
new file mode 100644
index 00000000000..23934037a85
--- /dev/null
+++ b/solr/licenses/poi-ooxml-schemas-4.1.1.jar.sha1
@@ -0,0 +1 @@
+7bb506f074a5bffce6b367f40ee0535fa7f73003
diff --git a/solr/licenses/poi-scratchpad-4.0.0.jar.sha1 b/solr/licenses/poi-scratchpad-4.0.0.jar.sha1
deleted file mode 100644
index ba817eef939..00000000000
--- a/solr/licenses/poi-scratchpad-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1038d3bb1ec34e93c184b4c5b690e2f51c6f7a60
diff --git a/solr/licenses/poi-scratchpad-4.1.1.jar.sha1 b/solr/licenses/poi-scratchpad-4.1.1.jar.sha1
new file mode 100644
index 00000000000..a4e8a6a1800
--- /dev/null
+++ b/solr/licenses/poi-scratchpad-4.1.1.jar.sha1
@@ -0,0 +1 @@
+11de428bf90a519b5a65046a5e629a33e0ffced2
diff --git a/solr/licenses/protobuf-java-3.11.0.jar.sha1 b/solr/licenses/protobuf-java-3.11.0.jar.sha1
new file mode 100644
index 00000000000..8c1770ef832
--- /dev/null
+++ b/solr/licenses/protobuf-java-3.11.0.jar.sha1
@@ -0,0 +1 @@
+992c02b8fba83bdda5602c12b5eee31e468b3069
diff --git a/solr/licenses/protobuf-java-3.6.1.jar.sha1 b/solr/licenses/protobuf-java-3.6.1.jar.sha1
deleted file mode 100644
index 56a4ab9880a..00000000000
--- a/solr/licenses/protobuf-java-3.6.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0d06d46ecfd92ec6d0f3b423b4cd81cb38d8b924
diff --git a/solr/licenses/rome-1.12.2.jar.sha1 b/solr/licenses/rome-1.12.2.jar.sha1
new file mode 100644
index 00000000000..6ca87d31340
--- /dev/null
+++ b/solr/licenses/rome-1.12.2.jar.sha1
@@ -0,0 +1 @@
+eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36
diff --git a/solr/licenses/rome-1.5.1.jar.sha1 b/solr/licenses/rome-1.5.1.jar.sha1
deleted file mode 100644
index f24eb2abbd8..00000000000
--- a/solr/licenses/rome-1.5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cc3489f066749bede7fc81f4e80c0d8c9534a210
diff --git a/solr/licenses/rome-utils-1.12.2.jar.sha1 b/solr/licenses/rome-utils-1.12.2.jar.sha1
new file mode 100644
index 00000000000..8d408332600
--- /dev/null
+++ b/solr/licenses/rome-utils-1.12.2.jar.sha1
@@ -0,0 +1 @@
+240dc40fb9333ac872319e7d31178bffc63f7900
diff --git a/solr/licenses/rome-utils-1.5.1.jar.sha1 b/solr/licenses/rome-utils-1.5.1.jar.sha1
deleted file mode 100644
index bc388b97c2d..00000000000
--- a/solr/licenses/rome-utils-1.5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3a3d6473a2f5d55fb31bf6c269af963fdea13b54
diff --git a/solr/licenses/tika-core-1.19.1.jar.sha1 b/solr/licenses/tika-core-1.19.1.jar.sha1
deleted file mode 100644
index d1448525b39..00000000000
--- a/solr/licenses/tika-core-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c1f075aa01586c2c28a249ad60bcfb733b69b866
diff --git a/solr/licenses/tika-core-1.23.jar.sha1 b/solr/licenses/tika-core-1.23.jar.sha1
new file mode 100644
index 00000000000..636d764ed55
--- /dev/null
+++ b/solr/licenses/tika-core-1.23.jar.sha1
@@ -0,0 +1 @@
+9ae162fa4758b8f3da5d0651c000c5e5f9efca04
diff --git a/solr/licenses/tika-java7-1.19.1.jar.sha1 b/solr/licenses/tika-java7-1.19.1.jar.sha1
deleted file mode 100644
index a5459a9e629..00000000000
--- a/solr/licenses/tika-java7-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-02661fd12fd9f0223e522dca72c1296108561263
diff --git a/solr/licenses/tika-java7-1.23.jar.sha1 b/solr/licenses/tika-java7-1.23.jar.sha1
new file mode 100644
index 00000000000..e250582114f
--- /dev/null
+++ b/solr/licenses/tika-java7-1.23.jar.sha1
@@ -0,0 +1 @@
+a9fad98d86348c028cc6287b4f47aba5ff070ca3
diff --git a/solr/licenses/tika-parsers-1.19.1.jar.sha1 b/solr/licenses/tika-parsers-1.19.1.jar.sha1
deleted file mode 100644
index 638428d2625..00000000000
--- a/solr/licenses/tika-parsers-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06d45a8683a7479f0e0d9d252f834d0ae44abd6b
diff --git a/solr/licenses/tika-parsers-1.23.jar.sha1 b/solr/licenses/tika-parsers-1.23.jar.sha1
new file mode 100644
index 00000000000..d7b00dbab6f
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.23.jar.sha1
@@ -0,0 +1 @@
+9507a1123b6fbb3de7c99368589fac4184cbcfaa
diff --git a/solr/licenses/tika-xmp-1.19.1.jar.sha1 b/solr/licenses/tika-xmp-1.19.1.jar.sha1
deleted file mode 100644
index 80f251317f2..00000000000
--- a/solr/licenses/tika-xmp-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b1bb7e00262813b3ef08b414fa0d5d06c45f2bb
diff --git a/solr/licenses/tika-xmp-1.23.jar.sha1 b/solr/licenses/tika-xmp-1.23.jar.sha1
new file mode 100644
index 00000000000..0eac3233c09
--- /dev/null
+++ b/solr/licenses/tika-xmp-1.23.jar.sha1
@@ -0,0 +1 @@
+8f9b23cbfee3f3025cc7bf623c85ba8356937f50
diff --git a/solr/licenses/xercesImpl-2.12.0.jar.sha1 b/solr/licenses/xercesImpl-2.12.0.jar.sha1
new file mode 100644
index 00000000000..551df5cdd53
--- /dev/null
+++ b/solr/licenses/xercesImpl-2.12.0.jar.sha1
@@ -0,0 +1 @@
+f02c844149fd306601f20e0b34853a670bef7fa2
diff --git a/solr/licenses/xercesImpl-2.9.1.jar.sha1 b/solr/licenses/xercesImpl-2.9.1.jar.sha1
deleted file mode 100644
index 86ebad92633..00000000000
--- a/solr/licenses/xercesImpl-2.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6
diff --git a/solr/licenses/xmlbeans-3.0.1.jar.sha1 b/solr/licenses/xmlbeans-3.0.1.jar.sha1
deleted file mode 100644
index 5b1d3582883..00000000000
--- a/solr/licenses/xmlbeans-3.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50d94da791ab1e799a11d6f82410fd7d49f402ca
diff --git a/solr/licenses/xmlbeans-3.1.0.jar.sha1 b/solr/licenses/xmlbeans-3.1.0.jar.sha1
new file mode 100644
index 00000000000..0b898a513e1
--- /dev/null
+++ b/solr/licenses/xmlbeans-3.1.0.jar.sha1
@@ -0,0 +1 @@
+6dac1f897dfb3e3f17fc79b18a3353b2e51c464e