Преглед изворни кода

Upgrading tika to 2.6.0 (#92104)

Upgrading tika and its dependencies.
Keith Massey пре 2 година
родитељ
комит
b4726ec7e5
3 измењених фајлова са 50 додато и 45 уклоњено
  1. 5 0
      docs/changelog/92104.yaml
  2. 42 42
      gradle/verification-metadata.xml
  3. 3 3
      modules/ingest-attachment/build.gradle

+ 5 - 0
docs/changelog/92104.yaml

@@ -0,0 +1,5 @@
+pr: 92104
+summary: Upgrading tika to 2.6.0
+area: Ingest Node
+type: upgrade
+issues: []

+ 42 - 42
gradle/verification-metadata.xml

@@ -2766,19 +2766,19 @@
             <sha256 value="08316826fa2b9357b061e52fa8f19ccae75420c949ebe29e28759d2bddd9b39b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.pdfbox" name="fontbox" version="2.0.26">
-         <artifact name="fontbox-2.0.26.jar">
-            <sha256 value="94674c7d10ea45d9b0dc10387892637fc8efb5c69d2e72694f1c66feb9bb6ed7" origin="Generated by Gradle"/>
+      <component group="org.apache.pdfbox" name="fontbox" version="2.0.27">
+         <artifact name="fontbox-2.0.27.jar">
+            <sha256 value="dc7429868aaf3d313c524b9aab846a405e89ca4927f35762ca4d1a60bce1d7f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.pdfbox" name="jempbox" version="1.8.16">
-         <artifact name="jempbox-1.8.16.jar">
-            <sha256 value="ebef7cca5a5a77768e686972b4a89f0ffce7b46907fd96ac3d4f6ce2fa038055" origin="Generated by Gradle"/>
+      <component group="org.apache.pdfbox" name="jempbox" version="1.8.17">
+         <artifact name="jempbox-1.8.17.jar">
+            <sha256 value="ded9c81038dd1bbcba18f07e1028d70c9ceaf0b48ac56cea8ab6ec2c255fc1b3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.pdfbox" name="pdfbox" version="2.0.26">
-         <artifact name="pdfbox-2.0.26.jar">
-            <sha256 value="b46ebb4140384b45a39e91e23b595ce9dcd8ba3a9ee914f15f40a42a9f805373" origin="Generated by Gradle"/>
+      <component group="org.apache.pdfbox" name="pdfbox" version="2.0.27">
+         <artifact name="pdfbox-2.0.27.jar">
+            <sha256 value="a25ad2a0be6b0bf9eb0e972abd09c34c0e797a3ce2a980d5ff035ff4cf078037" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.poi" name="poi" version="5.2.2">
@@ -2826,59 +2826,59 @@
             <sha256 value="3902794d36d9b81da1b7e697f21ed04ccae276cc116eecc640a4cd0fff2691f2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-core" version="2.4.0">
-         <artifact name="tika-core-2.4.0.jar">
-            <sha256 value="e6e25f52f3b542d39454d931b02aa4b01df99b384d6adf5bfaaf4566bf9ad3f2" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-langdetect-tika" version="2.4.0">
-         <artifact name="tika-langdetect-tika-2.4.0.jar">
-            <sha256 value="ad952474c23a44700476c55db7dea95ef239023618d83a8d5bba8e22e2a8b2fb" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-apple-module" version="2.4.0">
-         <artifact name="tika-parser-apple-module-2.4.0.jar">
-            <sha256 value="65a66604bb2dce6bd11757d6a09f4d81bb1ac9172a81dba38e12cbe8681ff073" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-html-module" version="2.4.0">
-         <artifact name="tika-parser-html-module-2.4.0.jar">
-            <sha256 value="2538806ef933edf3c18c6ca28077e18d30cfe9233500d0c5ec197bc9ac6f5bcb" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-microsoft-module" version="2.4.0">
-         <artifact name="tika-parser-microsoft-module-2.4.0.jar">
-            <sha256 value="760648b2bb5fa6ca99b03eed03c85a4310a20ae7c303fa263575534088b815cc" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-miscoffice-module" version="2.4.0">
-         <artifact name="tika-parser-miscoffice-module-2.4.0.jar">
-            <sha256 value="074cc6c6bb1e37599d2a9c7dbd8a87414b362ac5e89d7823d87b34dffef33eef" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-pdf-module" version="2.4.0">
-         <artifact name="tika-parser-pdf-module-2.4.0.jar">
-            <sha256 value="46b1a66b14c802b62227456d41027766835772a142d8974923b0f16dd2a7f000" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-text-module" version="2.4.0">
-         <artifact name="tika-parser-text-module-2.4.0.jar">
-            <sha256 value="bea22bb1ea5b6a3a18d7b5a3bbf0689f2becf7568799f0cd2965cb39348959e2" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-xml-module" version="2.4.0">
-         <artifact name="tika-parser-xml-module-2.4.0.jar">
-            <sha256 value="53e14c28b6b0b1d76b8b901cc3c8f4f04f12e5e5adfec4aee73a53fa82b83980" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-xmp-commons" version="2.4.0">
-         <artifact name="tika-parser-xmp-commons-2.4.0.jar">
-            <sha256 value="361c615f0c5322ba786d2b06274f9946f5ec8de7784edf4fa26375f755299a45" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
-      <component group="org.apache.tika" name="tika-parser-zip-commons" version="2.4.0">
-         <artifact name="tika-parser-zip-commons-2.4.0.jar">
-            <sha256 value="9b6fddbaf712e9f8810faa1e0eabd97dd051c9ca33f021d812fda4d75c83b60c" origin="Generated by Gradle"/>
+      <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"/>
          </artifact>
       </component>
       <component group="org.apache.xmlbeans" name="xmlbeans" version="5.0.3">

+ 3 - 3
modules/ingest-attachment/build.gradle

@@ -16,8 +16,8 @@ esplugin {
 }
 
 versions << [
-  'tika'  : '2.4.0',
-  'pdfbox': '2.0.26',
+  'tika'  : '2.6.0',
+  'pdfbox': '2.0.27',
   'poi'   : '5.2.2',
   'mime4j': '0.8.5'
 ]
@@ -49,7 +49,7 @@ dependencies {
   // Adobe PDF
   api "org.apache.pdfbox:pdfbox:${versions.pdfbox}"
   api "org.apache.pdfbox:fontbox:${versions.pdfbox}"
-  api "org.apache.pdfbox:jempbox:1.8.16"
+  api "org.apache.pdfbox:jempbox:1.8.17"
   api "commons-logging:commons-logging:${versions.commonslogging}"
   // OpenOffice
   api "org.apache.poi:poi-ooxml:${versions.poi}"