diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index 620f713d39d..8ce6006c624 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -13,7 +13,7 @@ com.carrotsearch.randomizedtesting.version = 2.5.3 /com.cybozu.labs/langdetect = 1.1-20120112 -/com.drewnoakes/metadata-extractor = 2.8.1 +/com.drewnoakes/metadata-extractor = 2.9.1 com.fasterxml.jackson.core.version = 2.5.4 /com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version} @@ -28,10 +28,11 @@ com.fasterxml.jackson.core.version = 2.5.4 /com.google.protobuf/protobuf-java = 3.1.0 /com.googlecode.juniversalchardet/juniversalchardet = 1.0.3 /com.googlecode.mp4parser/isoparser = 1.1.18 -/com.healthmarketscience.jackcess/jackcess = 2.1.3 +/com.healthmarketscience.jackcess/jackcess = 2.1.8 /com.ibm.icu/icu4j = 59.1 /com.pff/java-libpst = 0.8.1 +/com.rometools/rome = 1.5.1 com.sun.jersey.version = 1.9 /com.sun.jersey/jersey-core = ${com.sun.jersey.version} /com.sun.jersey/jersey-server = ${com.sun.jersey.version} @@ -78,7 +79,6 @@ io.netty.netty-all.version = 4.0.36.Final /net.bytebuddy/byte-buddy = 1.6.2 /net.hydromatic/eigenbase-properties = 1.1.5 /net.sf.ehcache/ehcache-core = 2.4.4 -/net.sourceforge.jmatio/jmatio = 1.0 /net.sourceforge.nekohtml/nekohtml = 1.9.17 /org.antlr/antlr4-runtime = 4.5.1-1 @@ -91,7 +91,8 @@ org.apache.calcite.version = 1.13.0 /org.apache.calcite/calcite-core = ${org.apache.calcite.version} /org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version} -/org.apache.commons/commons-compress = 1.11 +/org.apache.commons/commons-collections4 = 4.1 +/org.apache.commons/commons-compress = 1.14 /org.apache.commons/commons-exec = 1.3 /org.apache.commons/commons-lang3 = 3.6 /org.apache.commons/commons-math3 = 3.6.1 @@ -159,19 +160,19 @@ org.apache.james.apache.mime4j.version = 0.7.2 /org.apache.mina/mina-core = 2.0.0-M5 -org.apache.pdfbox.version = 2.0.1 +org.apache.pdfbox.version = 2.0.6 /org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version} -/org.apache.pdfbox/jempbox = 1.8.12 +/org.apache.pdfbox/jempbox = 1.8.13 /org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version} /org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version} -org.apache.poi.version = 3.15-beta1 +org.apache.poi.version = 3.17-beta1 /org.apache.poi/poi = ${org.apache.poi.version} /org.apache.poi/poi-ooxml = ${org.apache.poi.version} /org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version} /org.apache.poi/poi-scratchpad = ${org.apache.poi.version} -org.apache.tika.version = 1.13 +org.apache.tika.version = 1.16 /org.apache.tika/tika-core = ${org.apache.tika.version} /org.apache.tika/tika-java7 = ${org.apache.tika.version} /org.apache.tika/tika-parsers = ${org.apache.tika.version} @@ -275,8 +276,9 @@ org.slf4j.version = 1.7.7 /org.slf4j/slf4j-log4j12 = ${org.slf4j.version} /org.slf4j/slf4j-simple = ${org.slf4j.version} -/org.tukaani/xz = 1.5 -/rome/rome = 1.0 +/org.tallison/jmatio = 1.2 +/org.tukaani/xz = 1.6 + ua.net.nlp.morfologik-ukrainian-search.version = 3.9.0 /ua.net.nlp/morfologik-ukrainian-search = ${ua.net.nlp.morfologik-ukrainian-search.version} diff --git a/lucene/licenses/commons-compress-1.11.jar.sha1 b/lucene/licenses/commons-compress-1.11.jar.sha1 deleted file mode 100644 index 89bab1e9f7d..00000000000 --- a/lucene/licenses/commons-compress-1.11.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f43ce4c878078cbcfbb061353aa672a4c8e81443 diff --git a/lucene/licenses/commons-compress-1.14.jar.sha1 b/lucene/licenses/commons-compress-1.14.jar.sha1 new file mode 100644 index 00000000000..833f49badaf --- /dev/null +++ b/lucene/licenses/commons-compress-1.14.jar.sha1 @@ -0,0 +1 @@ +7b18320d668ab080758bf5383d6d8fcf750babce diff --git a/lucene/licenses/morfologik-ukrainian-search-3.7.5.jar.sha1 b/lucene/licenses/morfologik-ukrainian-search-3.7.5.jar.sha1 deleted file mode 100644 index 8794e71fbe9..00000000000 --- a/lucene/licenses/morfologik-ukrainian-search-3.7.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2b8c8fbd740164d220ca7d18605b8b2092e163e9 diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml index 42cee8af805..1d9d7a3d7b0 100644 --- a/solr/contrib/extraction/ivy.xml +++ b/solr/contrib/extraction/ivy.xml @@ -50,18 +50,19 @@ + - + - + diff --git a/solr/licenses/commons-compress-1.11.jar.sha1 b/solr/licenses/commons-compress-1.11.jar.sha1 deleted file mode 100644 index 89bab1e9f7d..00000000000 --- a/solr/licenses/commons-compress-1.11.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f43ce4c878078cbcfbb061353aa672a4c8e81443 diff --git a/solr/licenses/commons-compress-1.14.jar.sha1 b/solr/licenses/commons-compress-1.14.jar.sha1 new file mode 100644 index 00000000000..833f49badaf --- /dev/null +++ b/solr/licenses/commons-compress-1.14.jar.sha1 @@ -0,0 +1 @@ +7b18320d668ab080758bf5383d6d8fcf750babce diff --git a/solr/licenses/fontbox-2.0.1.jar.sha1 b/solr/licenses/fontbox-2.0.1.jar.sha1 deleted file mode 100644 index d55b6cb5f92..00000000000 --- a/solr/licenses/fontbox-2.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b9d4f0993e015f3f1ce0be9e7300cf62dd7a7f15 diff --git a/solr/licenses/fontbox-2.0.6.jar.sha1 b/solr/licenses/fontbox-2.0.6.jar.sha1 new file mode 100644 index 00000000000..dc11e43ebb2 --- /dev/null +++ b/solr/licenses/fontbox-2.0.6.jar.sha1 @@ -0,0 +1 @@ +33f44ea67f1b5ab314e2d5768365b1a3e794fb3b diff --git a/solr/licenses/jackcess-2.1.3.jar.sha1 b/solr/licenses/jackcess-2.1.3.jar.sha1 deleted file mode 100644 index fb74a2724a3..00000000000 --- a/solr/licenses/jackcess-2.1.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fe8553847c6744d61e071ef11a6a64010731d241 diff --git a/solr/licenses/jackcess-2.1.8.jar.sha1 b/solr/licenses/jackcess-2.1.8.jar.sha1 new file mode 100644 index 00000000000..ecfca41ec4f --- /dev/null +++ b/solr/licenses/jackcess-2.1.8.jar.sha1 @@ -0,0 +1 @@ +dfc7156e11ce33bbcb7f4f6724a87b9d969f2fd6 diff --git a/solr/licenses/jempbox-1.8.12.jar.sha1 b/solr/licenses/jempbox-1.8.12.jar.sha1 deleted file mode 100644 index 9882f8d5277..00000000000 --- a/solr/licenses/jempbox-1.8.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -426450c573c19f6f2c751a7a52c11931b712c9f6 diff --git a/solr/licenses/jempbox-1.8.13.jar.sha1 b/solr/licenses/jempbox-1.8.13.jar.sha1 new file mode 100644 index 00000000000..b1b5bdce0ac --- /dev/null +++ b/solr/licenses/jempbox-1.8.13.jar.sha1 @@ -0,0 +1 @@ +a874cef0ed0e2a8c4cc5ed52c23ba3e6d78eca4e diff --git a/solr/licenses/jmatio-1.0.jar.sha1 b/solr/licenses/jmatio-1.0.jar.sha1 deleted file mode 100644 index 8caf687f787..00000000000 --- a/solr/licenses/jmatio-1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df72993ea17d34c3bacd983558d2970a866abaf6 diff --git a/solr/licenses/jmatio-1.2.jar.sha1 b/solr/licenses/jmatio-1.2.jar.sha1 new file mode 100644 index 00000000000..5941dc987d5 --- /dev/null +++ b/solr/licenses/jmatio-1.2.jar.sha1 @@ -0,0 +1 @@ +69d8f2f49c1503f9b15b0eb50b1905a734a025e2 diff --git a/solr/licenses/metadata-extractor-2.8.1.jar.sha1 b/solr/licenses/metadata-extractor-2.8.1.jar.sha1 deleted file mode 100644 index d067bbf38ac..00000000000 --- a/solr/licenses/metadata-extractor-2.8.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -120630f96316e0f173aedf0c88bb06c5e146ad96 diff --git a/solr/licenses/metadata-extractor-2.9.1.jar.sha1 b/solr/licenses/metadata-extractor-2.9.1.jar.sha1 new file mode 100644 index 00000000000..fcdcfd6a5f5 --- /dev/null +++ b/solr/licenses/metadata-extractor-2.9.1.jar.sha1 @@ -0,0 +1 @@ +53fdf22be10c9d426ec63431c7342895bc642261 diff --git a/solr/licenses/pdfbox-2.0.1.jar.sha1 b/solr/licenses/pdfbox-2.0.1.jar.sha1 deleted file mode 100644 index a96cb90d25e..00000000000 --- a/solr/licenses/pdfbox-2.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dbc69649118b7eff278f228c070a40ee559e1f62 diff --git a/solr/licenses/pdfbox-2.0.6.jar.sha1 b/solr/licenses/pdfbox-2.0.6.jar.sha1 new file mode 100644 index 00000000000..9c93973e7dc --- /dev/null +++ b/solr/licenses/pdfbox-2.0.6.jar.sha1 @@ -0,0 +1 @@ +68616a583c5f9b9ba72140364d15a07cd937ce0e diff --git a/solr/licenses/pdfbox-tools-2.0.1.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.1.jar.sha1 deleted file mode 100644 index a38c974ebfb..00000000000 --- a/solr/licenses/pdfbox-tools-2.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a585a59c58f822884b1c5e56b670efa9241b699d diff --git a/solr/licenses/pdfbox-tools-2.0.6.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.6.jar.sha1 new file mode 100644 index 00000000000..dfc26a1fe13 --- /dev/null +++ b/solr/licenses/pdfbox-tools-2.0.6.jar.sha1 @@ -0,0 +1 @@ +3b0c2622015c048a29496291cfe44f235f5c7cdf diff --git a/solr/licenses/poi-3.15-beta1.jar.sha1 b/solr/licenses/poi-3.15-beta1.jar.sha1 deleted file mode 100644 index a6d9c5ed1b5..00000000000 --- a/solr/licenses/poi-3.15-beta1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -048bb8326b81323631d9ceb4236cfbd382e56da2 diff --git a/solr/licenses/poi-3.17-beta1.jar.sha1 b/solr/licenses/poi-3.17-beta1.jar.sha1 new file mode 100644 index 00000000000..83a318c349a --- /dev/null +++ b/solr/licenses/poi-3.17-beta1.jar.sha1 @@ -0,0 +1 @@ +d2df762cc8301c257db1fd0f4fc2f37ed9fbbb78 diff --git a/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1 b/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1 deleted file mode 100644 index ea710445bb5..00000000000 --- a/solr/licenses/poi-ooxml-3.15-beta1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81085a47fdf0d74d473d605c6b3784e26731842e diff --git a/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1 b/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1 new file mode 100644 index 00000000000..f16c93f961d --- /dev/null +++ b/solr/licenses/poi-ooxml-3.17-beta1.jar.sha1 @@ -0,0 +1 @@ +96f537614c5f5ec232fb8832313280dcb93c59ab diff --git a/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1 deleted file mode 100644 index 6b094dd2d58..00000000000 --- a/solr/licenses/poi-ooxml-schemas-3.15-beta1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f8bc979ad79908a99483337f1ca2edf78558ac20 diff --git a/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1 new file mode 100644 index 00000000000..fc999571c7c --- /dev/null +++ b/solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1 @@ -0,0 +1 @@ +99811dc063afea4cde813726ba6f45f724bf2c3b diff --git a/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1 b/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1 deleted file mode 100644 index 5a301267009..00000000000 --- a/solr/licenses/poi-scratchpad-3.15-beta1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f4e276aaf97a60a1156388c9e38069122b7ea914 diff --git a/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1 b/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1 new file mode 100644 index 00000000000..a2b7c33f3d7 --- /dev/null +++ b/solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1 @@ -0,0 +1 @@ +d4ad39b023c377ec534ab25205344eb79da4996b diff --git a/solr/licenses/rome-1.0.jar.sha1 b/solr/licenses/rome-1.0.jar.sha1 deleted file mode 100644 index 84810783e4d..00000000000 --- a/solr/licenses/rome-1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -022b33347f315833e9348cec2751af1a5d5656e4 diff --git a/solr/licenses/rome-1.5.1.jar.sha1 b/solr/licenses/rome-1.5.1.jar.sha1 new file mode 100644 index 00000000000..f24eb2abbd8 --- /dev/null +++ b/solr/licenses/rome-1.5.1.jar.sha1 @@ -0,0 +1 @@ +cc3489f066749bede7fc81f4e80c0d8c9534a210 diff --git a/solr/licenses/tika-core-1.13.jar.sha1 b/solr/licenses/tika-core-1.13.jar.sha1 deleted file mode 100644 index 90ffc56432c..00000000000 --- a/solr/licenses/tika-core-1.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1305c798d41d1d7bbf12cb7c0ca184c98eed25ad diff --git a/solr/licenses/tika-core-1.16.jar.sha1 b/solr/licenses/tika-core-1.16.jar.sha1 new file mode 100644 index 00000000000..e8ee0285626 --- /dev/null +++ b/solr/licenses/tika-core-1.16.jar.sha1 @@ -0,0 +1 @@ +7b75cb2b65f6d014b6a3e4793835f5759168c34e diff --git a/solr/licenses/tika-java7-1.13.jar.sha1 b/solr/licenses/tika-java7-1.13.jar.sha1 deleted file mode 100644 index 80d5225b192..00000000000 --- a/solr/licenses/tika-java7-1.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d6ffea1f1f76faa01509598b8a31f54b3da124cd diff --git a/solr/licenses/tika-java7-1.16.jar.sha1 b/solr/licenses/tika-java7-1.16.jar.sha1 new file mode 100644 index 00000000000..97a229dbae6 --- /dev/null +++ b/solr/licenses/tika-java7-1.16.jar.sha1 @@ -0,0 +1 @@ +b4d7dc8dd2f592824cb0fa0677d08fe9bbee2ab4 diff --git a/solr/licenses/tika-parsers-1.13.jar.sha1 b/solr/licenses/tika-parsers-1.13.jar.sha1 deleted file mode 100644 index 6e704e76804..00000000000 --- a/solr/licenses/tika-parsers-1.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -374fde67b9d35f785534b0e6c4953533c31bab5f diff --git a/solr/licenses/tika-parsers-1.16.jar.sha1 b/solr/licenses/tika-parsers-1.16.jar.sha1 new file mode 100644 index 00000000000..4b16dde1a75 --- /dev/null +++ b/solr/licenses/tika-parsers-1.16.jar.sha1 @@ -0,0 +1 @@ +bececafbe32c013eae8d3f3cf10d28b136a6f9d7 diff --git a/solr/licenses/tika-xmp-1.13.jar.sha1 b/solr/licenses/tika-xmp-1.13.jar.sha1 deleted file mode 100644 index 38942cd1f2c..00000000000 --- a/solr/licenses/tika-xmp-1.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1d73457bcc68ba7df72833baa40b29c39ce4a67e diff --git a/solr/licenses/tika-xmp-1.16.jar.sha1 b/solr/licenses/tika-xmp-1.16.jar.sha1 new file mode 100644 index 00000000000..0c4ce3aff87 --- /dev/null +++ b/solr/licenses/tika-xmp-1.16.jar.sha1 @@ -0,0 +1 @@ +06db0bda27d4edf452c5a72a29f78805bfd23a0f diff --git a/solr/licenses/xz-1.5.jar.sha1 b/solr/licenses/xz-1.5.jar.sha1 deleted file mode 100644 index 2e2d390b6bf..00000000000 --- a/solr/licenses/xz-1.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9c64274b7dbb65288237216e3fae7877fd3f2bee diff --git a/solr/licenses/xz-1.6.jar.sha1 b/solr/licenses/xz-1.6.jar.sha1 new file mode 100644 index 00000000000..30da8185d5b --- /dev/null +++ b/solr/licenses/xz-1.6.jar.sha1 @@ -0,0 +1 @@ +05b6f921f1810bdf90e25471968f741f87168b64