Upgrade tika to 2.7.0 (elastic#93759)

carlosdelest · Feb 21, 2023 · 33b4f6c · 33b4f6c
1 parent 1bf6422
commit 33b4f6c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 45 deletions.
diff --git a/docs/changelog/93759.yaml b/docs/changelog/93759.yaml
@@ -0,0 +1,5 @@
+pr: 93759
+summary: Upgrading tika to 2.7.0
+area: Ingest Node
+type: upgrade
+issues: []
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -2206,14 +2206,14 @@
             <sha256 value="71fcfbe869002c48563cc5979fc734571c8d0d167ccce42970c932f337981f19" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.james" name="apache-mime4j-core" version="0.8.5">
-         <artifact name="apache-mime4j-core-0.8.5.jar">
-            <sha256 value="a0c649bab97c98a8a88ad67e49dd3c69f3392ba021c9a877820bc9b2690577b7" origin="Generated by Gradle"/>
+      <component group="org.apache.james" name="apache-mime4j-core" version="0.8.9">
+         <artifact name="apache-mime4j-core-0.8.9.jar">
+            <sha256 value="901486a66c0eeee9d6bd63b1eaa195e164100cf415b0122388813d484947801f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.james" name="apache-mime4j-dom" version="0.8.5">
-         <artifact name="apache-mime4j-dom-0.8.5.jar">
-            <sha256 value="c1a6ec0344e1eb0fcf9088f88d726e2254544806623ad6d37800300ea48f177b" origin="Generated by Gradle"/>
+      <component group="org.apache.james" name="apache-mime4j-dom" version="0.8.9">
+         <artifact name="apache-mime4j-dom-0.8.9.jar">
+            <sha256 value="726d04098a6317cf175b3708a736ed4ecbc09cf7673784eaf1f4251f030d2433" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.kerby" name="kerb-admin" version="1.0.1">
@@ -2596,59 +2596,59 @@
             <sha256 value="3902794d36d9b81da1b7e697f21ed04ccae276cc116eecc640a4cd0fff2691f2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-core" version="2.6.0">
-         <artifact name="tika-core-2.6.0.jar">
-            <sha256 value="efc588724490efc77126c1295d0a6c73ddb812d8bf214ae347fab75e0aa4dc81" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-core" version="2.7.0">
+         <artifact name="tika-core-2.7.0.jar">
+            <sha256 value="2603961edec8bcee014d2c360e5a9a0cdbf10aa8e6e95cf67abe190c837bb054" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-langdetect-tika" version="2.6.0">
-         <artifact name="tika-langdetect-tika-2.6.0.jar">
-            <sha256 value="1431c1f18211798672f76749e5118afbbb72f121802ca1613c9801e62186c54f" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-langdetect-tika" version="2.7.0">
+         <artifact name="tika-langdetect-tika-2.7.0.jar">
+            <sha256 value="4cd03d25d9ae93f26b05188fdfffd4c3f48ce9f423d194437ad7f12d4f8bafc0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-apple-module" version="2.6.0">
-         <artifact name="tika-parser-apple-module-2.6.0.jar">
-            <sha256 value="c1fbb6e29350e2a8aa48bd4ae5fc8e6bd8904f5e70cf016b60898c5cf559ace8" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-apple-module" version="2.7.0">
+         <artifact name="tika-parser-apple-module-2.7.0.jar">
+            <sha256 value="e5303a09f926477764620650e47167625b52bb5c46d3f2cb7cdc316cb2017bfd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-html-module" version="2.6.0">
-         <artifact name="tika-parser-html-module-2.6.0.jar">
-            <sha256 value="b89064745539ca01739d5990ac322aefc91b2103cea3633dfd215823f4847248" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-html-module" version="2.7.0">
+         <artifact name="tika-parser-html-module-2.7.0.jar">
+            <sha256 value="fdbc91231cbd0b6f671b935e26b6f1a2721a2179941958740eb274d1641460e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-microsoft-module" version="2.6.0">
-         <artifact name="tika-parser-microsoft-module-2.6.0.jar">
-            <sha256 value="deb973b247112c17477d96bb4929fb65a28fa6900953732b82998d4c5ec48386" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-microsoft-module" version="2.7.0">
+         <artifact name="tika-parser-microsoft-module-2.7.0.jar">
+            <sha256 value="20c82dc0dba1cba85432cf16fd637fa536905e53e3813ce63ed4a01399cb725b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-miscoffice-module" version="2.6.0">
-         <artifact name="tika-parser-miscoffice-module-2.6.0.jar">
-            <sha256 value="901c8d77a4b054ae95203325883649f9acff2411529770554d9f64a4b61d83eb" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-miscoffice-module" version="2.7.0">
+         <artifact name="tika-parser-miscoffice-module-2.7.0.jar">
+            <sha256 value="4355f3fcf623b062c95e55045584a67dbc97fd2aa543943ec31c0823c45ea4b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-pdf-module" version="2.6.0">
-         <artifact name="tika-parser-pdf-module-2.6.0.jar">
-            <sha256 value="7900c08e952407b1754c1e07232d8d72a01e51e3ba602fcbe9e6310b2a476f3e" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-pdf-module" version="2.7.0">
+         <artifact name="tika-parser-pdf-module-2.7.0.jar">
+            <sha256 value="8fd4dc14fcf7a7ddfda683b07e407a092a7d6b1c808c394214c282f476457f57" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-text-module" version="2.6.0">
-         <artifact name="tika-parser-text-module-2.6.0.jar">
-            <sha256 value="15b7e20c51ed14d1dac25ba9b7d1179603a36f93204e7f445c0ab98e41b14d83" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-text-module" version="2.7.0">
+         <artifact name="tika-parser-text-module-2.7.0.jar">
+            <sha256 value="9c5407747401f3ad1f2f955a55c7610e7f0329e6662ad17751468bffd12a6611" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-xml-module" version="2.6.0">
-         <artifact name="tika-parser-xml-module-2.6.0.jar">
-            <sha256 value="124d3ef1a35fc368bc3a49d616821bfe997e95e50f1c991b7d7076b7e9546462" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-xml-module" version="2.7.0">
+         <artifact name="tika-parser-xml-module-2.7.0.jar">
+            <sha256 value="871d914b46dd673e005b7e316b98c975799195584d56fe649de73166120459c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-xmp-commons" version="2.6.0">
-         <artifact name="tika-parser-xmp-commons-2.6.0.jar">
-            <sha256 value="b96bb7d066ced0a88cf3223363642dcba3d581592d5b0770ed197e7520f5bbf0" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-xmp-commons" version="2.7.0">
+         <artifact name="tika-parser-xmp-commons-2.7.0.jar">
+            <sha256 value="86021cd5b4cb41c6125aae4d425d0e7e73bfd07b0386ec1d7303cfbb4f9290c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-zip-commons" version="2.6.0">
-         <artifact name="tika-parser-zip-commons-2.6.0.jar">
-            <sha256 value="84a81033ab310540176d480d15f7409d42d33453e474f7a2feaa906a4431cea2" origin="Generated by Gradle"/>
+      <component group="org.apache.tika" name="tika-parser-zip-commons" version="2.7.0">
+         <artifact name="tika-parser-zip-commons-2.7.0.jar">
+            <sha256 value="82912c8171199f55289a41e664392852d0ed80287e5f43c348b16f5a95d889a2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.xmlbeans" name="xmlbeans" version="5.1.1">
@@ -3514,9 +3514,9 @@
             <sha256 value="fe30825245d2336c859dc38d60c0fc5f3668dbf29cd586828d2b5667ec355b91" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.slf4j" name="slf4j-api" version="2.0.3">
-         <artifact name="slf4j-api-2.0.3.jar">
-            <sha256 value="68ddcda65300ff8097ad1a096d7cd2fb06cef25193887cec3f2690e01bdbf421" origin="Generated by Gradle"/>
+      <component group="org.slf4j" name="slf4j-api" version="2.0.6">
+         <artifact name="slf4j-api-2.0.6.jar">
+            <sha256 value="2f2a92d410b268139d7d63b75ed25e21995cfe4100c19bf23577cfdbc8077bda" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.slf4j" name="slf4j-log4j12" version="1.7.10">

diff --git a/modules/ingest-attachment/build.gradle b/modules/ingest-attachment/build.gradle
@@ -18,15 +18,15 @@ esplugin {
 // this overwrites the 'versions' map from Elasticsearch itself, but indeed we want that -- we're interested in managing our dependencies
 // as we (and tika) demand, and are not interested in, say, having the same version of commons-codec as elasticsearch itself
 def versions = [
-  'tika'  : '2.6.0',
+  'tika'  : '2.7.0',
   'pdfbox': '2.0.27',
   'poi'   : '5.2.3',
-  'mime4j': '0.8.5'
+  'mime4j': '0.8.9'
 ]
 
 dependencies {
   // logging
-  api "org.slf4j:slf4j-api:2.0.3"
+  api "org.slf4j:slf4j-api:2.0.6"
   api "commons-logging:commons-logging:1.2"
 
   // mandatory for tika