ctargett closed pull request #419: SOLR-12551 - upgrade to Tika 1.18, first
draft
URL: https://github.com/apache/lucene-solr/pull/419
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index c67c0772f1f..869b3fa852d 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -28,7 +28,7 @@ com.fasterxml.jackson.core.version = 2.9.5
/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.8
+/com.healthmarketscience.jackcess/jackcess = 2.1.10
/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
/com.ibm.icu/icu4j = 62.1
/com.lmax/disruptor = 3.4.0
@@ -109,7 +109,7 @@ org.apache.calcite.version = 1.13.0
/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
/org.apache.commons/commons-collections4 = 4.1
-/org.apache.commons/commons-compress = 1.14
+/org.apache.commons/commons-compress = 1.16.1
/org.apache.commons/commons-exec = 1.3
/org.apache.commons/commons-lang3 = 3.6
/org.apache.commons/commons-math3 = 3.6.1
@@ -184,9 +184,9 @@ org.apache.logging.log4j.version = 2.11.0
/org.apache.mina/mina-core = 2.0.0-M5
/org.apache.opennlp/opennlp-maxent = 3.0.3
-/org.apache.opennlp/opennlp-tools = 1.8.3
+/org.apache.opennlp/opennlp-tools = 1.8.4
-org.apache.pdfbox.version = 2.0.8
+org.apache.pdfbox.version = 2.0.9
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/jempbox = 1.8.13
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
@@ -198,7 +198,7 @@ org.apache.poi.version = 3.17
/org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
/org.apache.poi/poi-scratchpad = ${org.apache.poi.version}
-org.apache.tika.version = 1.17
+org.apache.tika.version = 1.18
/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}
@@ -264,9 +264,9 @@ org.gagravarr.vorbis.java.version = 0.8
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
/org.hsqldb/hsqldb = 2.4.0
-/org.jdom/jdom = 2.0.2
+/org.jdom/jdom2 = 2.0.6
-/org.jsoup/jsoup = 1.8.2
+/org.jsoup/jsoup = 1.11.2
/org.locationtech.jts/jts-core = 1.15.0
/org.locationtech.spatial4j/spatial4j = 0.7
@@ -300,7 +300,7 @@ org.slf4j.version = 1.7.24
/org.slf4j/slf4j-simple = ${org.slf4j.version}
/org.tallison/jmatio = 1.2
-/org.tukaani/xz = 1.6
+/org.tukaani/xz = 1.8
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.14.jar.sha1
b/lucene/licenses/commons-compress-1.14.jar.sha1
deleted file mode 100644
index 833f49badaf..00000000000
--- a/lucene/licenses/commons-compress-1.14.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b18320d668ab080758bf5383d6d8fcf750babce
diff --git a/lucene/licenses/commons-compress-1.16.1.jar.sha1
b/lucene/licenses/commons-compress-1.16.1.jar.sha1
new file mode 100644
index 00000000000..369e1a094f7
--- /dev/null
+++ b/lucene/licenses/commons-compress-1.16.1.jar.sha1
@@ -0,0 +1 @@
+7b5cdabadb4cf12f5ee0f801399e70635583193f
diff --git a/lucene/licenses/opennlp-tools-1.8.3.jar.sha1
b/lucene/licenses/opennlp-tools-1.8.3.jar.sha1
deleted file mode 100644
index c6a75491031..00000000000
--- a/lucene/licenses/opennlp-tools-1.8.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3ce7c9056048f55478d983248cf18c7e02b1d072
diff --git a/lucene/licenses/opennlp-tools-1.8.4.jar.sha1
b/lucene/licenses/opennlp-tools-1.8.4.jar.sha1
new file mode 100644
index 00000000000..3c31e233c96
--- /dev/null
+++ b/lucene/licenses/opennlp-tools-1.8.4.jar.sha1
@@ -0,0 +1 @@
+dc1dd0bfdee4a4bc98924180da5a8e61b3a50bdd
diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml
index 62ba750f90e..d4989ace27e 100644
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@ -61,7 +61,7 @@
<dependency org="de.l3s.boilerpipe" name="boilerpipe"
rev="${/de.l3s.boilerpipe/boilerpipe}" conf="compile"/>
<dependency org="com.rometools" name="rome" rev="${/com.rometools/rome}"
conf="compile"/>
<dependency org="com.rometools" name="rome-utils"
rev="${/com.rometools/rome-utils}" conf="compile"/>
- <dependency org="org.jdom" name="jdom" rev="${/org.jdom/jdom}"
conf="compile"/>
+ <dependency org="org.jdom" name="jdom2" rev="${/org.jdom/jdom2}"
conf="compile"/>
<dependency org="com.googlecode.juniversalchardet"
name="juniversalchardet"
rev="${/com.googlecode.juniversalchardet/juniversalchardet}" conf="compile"/>
<dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}"
conf="compile"/>
<dependency org="com.adobe.xmp" name="xmpcore"
rev="${/com.adobe.xmp/xmpcore}" conf="compile"/>
diff --git a/solr/licenses/commons-compress-1.14.jar.sha1
b/solr/licenses/commons-compress-1.14.jar.sha1
deleted file mode 100644
index 833f49badaf..00000000000
--- a/solr/licenses/commons-compress-1.14.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b18320d668ab080758bf5383d6d8fcf750babce
diff --git a/solr/licenses/commons-compress-1.16.1.jar.sha1
b/solr/licenses/commons-compress-1.16.1.jar.sha1
new file mode 100644
index 00000000000..369e1a094f7
--- /dev/null
+++ b/solr/licenses/commons-compress-1.16.1.jar.sha1
@@ -0,0 +1 @@
+7b5cdabadb4cf12f5ee0f801399e70635583193f
diff --git a/solr/licenses/fontbox-2.0.8.jar.sha1
b/solr/licenses/fontbox-2.0.8.jar.sha1
deleted file mode 100644
index 92adafe56e5..00000000000
--- a/solr/licenses/fontbox-2.0.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-52f852fcfc7481d45efdffd224eb78b85981b17b
diff --git a/solr/licenses/fontbox-2.0.9.jar.sha1
b/solr/licenses/fontbox-2.0.9.jar.sha1
new file mode 100644
index 00000000000..1fbba183af5
--- /dev/null
+++ b/solr/licenses/fontbox-2.0.9.jar.sha1
@@ -0,0 +1 @@
+f961f17ebdbc307e9055e3cf7c0e207f0895ae55
diff --git a/solr/licenses/jackcess-2.1.10.jar.sha1
b/solr/licenses/jackcess-2.1.10.jar.sha1
new file mode 100644
index 00000000000..0d946a05f28
--- /dev/null
+++ b/solr/licenses/jackcess-2.1.10.jar.sha1
@@ -0,0 +1 @@
+4a10b9316831c2fc1f87853bb6745909dab5a8a5
diff --git a/solr/licenses/jackcess-2.1.8.jar.sha1
b/solr/licenses/jackcess-2.1.8.jar.sha1
deleted file mode 100644
index ecfca41ec4f..00000000000
--- a/solr/licenses/jackcess-2.1.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfc7156e11ce33bbcb7f4f6724a87b9d969f2fd6
diff --git a/solr/licenses/jdom-2.0.2.jar.sha1
b/solr/licenses/jdom-2.0.2.jar.sha1
deleted file mode 100644
index 2a2eb7a9056..00000000000
--- a/solr/licenses/jdom-2.0.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d06c71e0df0ac4b94deb737718580ccce22d92e8
diff --git a/solr/licenses/jdom2-2.0.6.jar.sha1
b/solr/licenses/jdom2-2.0.6.jar.sha1
new file mode 100644
index 00000000000..5e10b2db38a
--- /dev/null
+++ b/solr/licenses/jdom2-2.0.6.jar.sha1
@@ -0,0 +1 @@
+6f14738ec2e9dd0011e343717fa624a10f8aab64
diff --git a/solr/licenses/jdom-LICENSE-BSD_LIKE.txt
b/solr/licenses/jdom2-LICENSE-BSD_LIKE.txt
similarity index 100%
rename from solr/licenses/jdom-LICENSE-BSD_LIKE.txt
rename to solr/licenses/jdom2-LICENSE-BSD_LIKE.txt
diff --git a/solr/licenses/jdom-NOTICE.txt b/solr/licenses/jdom2-NOTICE.txt
similarity index 100%
rename from solr/licenses/jdom-NOTICE.txt
rename to solr/licenses/jdom2-NOTICE.txt
diff --git a/solr/licenses/jsoup-1.11.2.jar.sha1
b/solr/licenses/jsoup-1.11.2.jar.sha1
new file mode 100644
index 00000000000..b4a888c20ef
--- /dev/null
+++ b/solr/licenses/jsoup-1.11.2.jar.sha1
@@ -0,0 +1 @@
+e3eeb8a0b4ce1db246059a41e353cd7413dad226
diff --git a/solr/licenses/jsoup-1.8.2.jar.sha1
b/solr/licenses/jsoup-1.8.2.jar.sha1
deleted file mode 100644
index cdb9ca65e2e..00000000000
--- a/solr/licenses/jsoup-1.8.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-64238922c4006c3d0a9951c4c03983ecc6a1e1a0
diff --git a/solr/licenses/opennlp-tools-1.8.3.jar.sha1
b/solr/licenses/opennlp-tools-1.8.3.jar.sha1
deleted file mode 100644
index c6a75491031..00000000000
--- a/solr/licenses/opennlp-tools-1.8.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3ce7c9056048f55478d983248cf18c7e02b1d072
diff --git a/solr/licenses/opennlp-tools-1.8.4.jar.sha1
b/solr/licenses/opennlp-tools-1.8.4.jar.sha1
new file mode 100644
index 00000000000..3c31e233c96
--- /dev/null
+++ b/solr/licenses/opennlp-tools-1.8.4.jar.sha1
@@ -0,0 +1 @@
+dc1dd0bfdee4a4bc98924180da5a8e61b3a50bdd
diff --git a/solr/licenses/pdfbox-2.0.8.jar.sha1
b/solr/licenses/pdfbox-2.0.8.jar.sha1
deleted file mode 100644
index 9700a41e481..00000000000
--- a/solr/licenses/pdfbox-2.0.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-17bdf273d66f3afe41eedb9d3ab6a7b819c44a0c
diff --git a/solr/licenses/pdfbox-2.0.9.jar.sha1
b/solr/licenses/pdfbox-2.0.9.jar.sha1
new file mode 100644
index 00000000000..35f04eb7b28
--- /dev/null
+++ b/solr/licenses/pdfbox-2.0.9.jar.sha1
@@ -0,0 +1 @@
+d0425578218624388f2ec84a0b3a11efd55df0f5
diff --git a/solr/licenses/pdfbox-tools-2.0.8.jar.sha1
b/solr/licenses/pdfbox-tools-2.0.8.jar.sha1
deleted file mode 100644
index 1b7b9dc52dd..00000000000
--- a/solr/licenses/pdfbox-tools-2.0.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c0ba702f74b2d1baca1f0d5e172738b3c122fac
diff --git a/solr/licenses/pdfbox-tools-2.0.9.jar.sha1
b/solr/licenses/pdfbox-tools-2.0.9.jar.sha1
new file mode 100644
index 00000000000..6c1e535c1b3
--- /dev/null
+++ b/solr/licenses/pdfbox-tools-2.0.9.jar.sha1
@@ -0,0 +1 @@
+90a58b4daf37697488339845e0a3e0d3609eb781
diff --git a/solr/licenses/tika-core-1.17.jar.sha1
b/solr/licenses/tika-core-1.17.jar.sha1
deleted file mode 100644
index 684dd9471ba..00000000000
--- a/solr/licenses/tika-core-1.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b450102c2aee98107474d2f92661d947b9cef183
diff --git a/solr/licenses/tika-core-1.18.jar.sha1
b/solr/licenses/tika-core-1.18.jar.sha1
new file mode 100644
index 00000000000..11e6fe60dfb
--- /dev/null
+++ b/solr/licenses/tika-core-1.18.jar.sha1
@@ -0,0 +1 @@
+69556697de96cf0b22df846e970dafd29866eee0
diff --git a/solr/licenses/tika-java7-1.17.jar.sha1
b/solr/licenses/tika-java7-1.17.jar.sha1
deleted file mode 100644
index c58ee42e429..00000000000
--- a/solr/licenses/tika-java7-1.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e97e815dd1212c01b9e97d02402d57ab5bc835cc
diff --git a/solr/licenses/tika-java7-1.18.jar.sha1
b/solr/licenses/tika-java7-1.18.jar.sha1
new file mode 100644
index 00000000000..f0f9282a5db
--- /dev/null
+++ b/solr/licenses/tika-java7-1.18.jar.sha1
@@ -0,0 +1 @@
+07891212df835f740be0ca92040280915b0cd9d4
diff --git a/solr/licenses/tika-parsers-1.17.jar.sha1
b/solr/licenses/tika-parsers-1.17.jar.sha1
deleted file mode 100644
index e4065fed5e3..00000000000
--- a/solr/licenses/tika-parsers-1.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4277c54fcaed542fbc8a0001fdb4c23baccc0132
diff --git a/solr/licenses/tika-parsers-1.18.jar.sha1
b/solr/licenses/tika-parsers-1.18.jar.sha1
new file mode 100644
index 00000000000..bf84c0a7f52
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.18.jar.sha1
@@ -0,0 +1 @@
+7d9b6dea91d783165f3313d320d3aaaa9a4dfc13
diff --git a/solr/licenses/tika-xmp-1.17.jar.sha1
b/solr/licenses/tika-xmp-1.17.jar.sha1
deleted file mode 100644
index 2ae91e929ce..00000000000
--- a/solr/licenses/tika-xmp-1.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7845ff9b484799b2c57055f7253f816e48b4f66
diff --git a/solr/licenses/tika-xmp-1.18.jar.sha1
b/solr/licenses/tika-xmp-1.18.jar.sha1
new file mode 100644
index 00000000000..734fd64d4ff
--- /dev/null
+++ b/solr/licenses/tika-xmp-1.18.jar.sha1
@@ -0,0 +1 @@
+85eb7fbe700291159ea8c072e8158f1beb5f66ab
diff --git a/solr/licenses/xz-1.6.jar.sha1 b/solr/licenses/xz-1.6.jar.sha1
deleted file mode 100644
index 30da8185d5b..00000000000
--- a/solr/licenses/xz-1.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-05b6f921f1810bdf90e25471968f741f87168b64
diff --git a/solr/licenses/xz-1.8.jar.sha1 b/solr/licenses/xz-1.8.jar.sha1
new file mode 100644
index 00000000000..2f7c246941d
--- /dev/null
+++ b/solr/licenses/xz-1.8.jar.sha1
@@ -0,0 +1 @@
+c4f7d054303948eb6a4066194253886c8af07128
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: dev-h...@lucene.apache.org
