Bump tika from 2.9.2 to 3.2.2

CHANGELOG.md

@@ -39,6 +39,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.nimbusds:nimbus-jose-jwt` from 10.3 to 10.4.2 ([#19099](https://github.com/opensearch-project/OpenSearch/pull/19099), [#19101](https://github.com/opensearch-project/OpenSearch/pull/19101))
 - Bump netty from 4.1.121.Final to 4.1.124.Final ([#19103](https://github.com/opensearch-project/OpenSearch/pull/19103))
 - Bump google cloud storage from 1.113.1 to 2.55.0 ([#4547](https://github.com/opensearch-project/OpenSearch/pull/4547))
+- Bump tika from 2.9.2 to 3.2.2 ([#19125](https://github.com/opensearch-project/OpenSearch/pull/19125))
+- Bump commons-compress from 1.26.1 to 1.28.0 ([#19125](https://github.com/opensearch-project/OpenSearch/pull/19125))
 
 ### Deprecated
 

distribution/tools/plugin-cli/build.gradle

@@ -81,5 +81,10 @@ thirdPartyAudit.ignoreMissingClasses(
   'org.tukaani.xz.XZOutputStream',
   'org.apache.commons.codec.digest.PureJavaCrc32C',
   'org.apache.commons.codec.digest.XXHash32',
-  'org.apache.commons.lang3.reflect.FieldUtils'
+  'org.apache.commons.lang3.reflect.FieldUtils',
+  'org.apache.commons.lang3.ArrayFill',
+  'org.apache.commons.lang3.ArrayUtils',
+  'org.apache.commons.lang3.StringUtils',
+  'org.apache.commons.lang3.SystemProperties',
+  'org.apache.commons.lang3.function.Suppliers'
 )

distribution/tools/plugin-cli/licenses/commons-compress-1.28.0.jar.sha1

@@ -0,0 +1 @@
+e482f2c7a88dac3c497e96aa420b6a769f59c8d7

gradle/libs.versions.toml

@@ -50,7 +50,7 @@ httpasyncclient   = "4.1.5"
 commonslogging    = "1.2"
 commonscodec      = "1.18.0"
 commonslang       = "3.18.0"
-commonscompress   = "1.26.1"
+commonscompress   = "1.28.0"
 commonsio         = "2.16.0"
 # plugin dependencies
 aws               = "2.30.31"

plugins/ingest-attachment/build.gradle

@@ -38,8 +38,8 @@ opensearchplugin {
 }
 
 versions << [
-  'tika'  : '2.9.2',
-  'pdfbox': '2.0.31',
+  'tika'  : '3.2.2',
+  'pdfbox': '3.0.5',
   'poi'   : '5.4.1',
   'mime4j': '0.8.11'
 ]
@@ -75,10 +75,11 @@ dependencies {
 
   // external parser libraries
   // HTML
-  api 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
+  api 'org.jsoup:jsoup:1.20.1'
   // Adobe PDF
   api "org.apache.pdfbox:pdfbox:${versions.pdfbox}"
   api "org.apache.pdfbox:fontbox:${versions.pdfbox}"
+  api "org.apache.pdfbox:pdfbox-io:${versions.pdfbox}"
   api "org.apache.pdfbox:jempbox:1.8.17"
   api "commons-logging:commons-logging:${versions.commonslogging}"
   // OpenOffice

plugins/ingest-attachment/licenses/commons-compress-1.28.0.jar.sha1

@@ -0,0 +1 @@
+e482f2c7a88dac3c497e96aa420b6a769f59c8d7

plugins/ingest-attachment/licenses/jsoup-1.20.1.jar.sha1

@@ -0,0 +1 @@
+769377896610be1736f8d6d51fc52a6042d1ce82

plugins/ingest-attachment/licenses/jsoup-LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2009-2025 Jonathan Hedley <https://jsoup.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

plugins/ingest-attachment/licenses/tika-core-3.2.2.jar.sha1

@@ -0,0 +1 @@
+f1f16ecac7a81e145051f906927ea6b58ce7e914

plugins/ingest-attachment/licenses/tika-langdetect-optimaize-3.2.2.jar.sha1

@@ -0,0 +1 @@
+3ee2907773fe2aaa1013829e00cd62778d6a2ff9

plugins/ingest-attachment/licenses/tika-parser-apple-module-3.2.2.jar.sha1

@@ -0,0 +1 @@
+fde21727740a39beead899c9ca6e642f92d86e3a

plugins/ingest-attachment/licenses/tika-parser-html-module-3.2.2.jar.sha1

@@ -0,0 +1 @@
+e6acd314da558703977a681661c215f3ef92dbbd

plugins/ingest-attachment/licenses/tika-parser-microsoft-module-3.2.2.jar.sha1

@@ -0,0 +1 @@
+41ff68abccde91ab17d7b181eb7a5fccf16e8b5c

plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-3.2.2.jar.sha1

@@ -0,0 +1 @@
+d4078f950ca55c5235cdfcad744235242f9edc05

plugins/ingest-attachment/licenses/tika-parser-pdf-module-3.2.2.jar.sha1

@@ -0,0 +1 @@
+a972d70ef0762b460c048c5e0e8a46c46bb170aa

plugins/ingest-attachment/licenses/tika-parser-text-module-3.2.2.jar.sha1

@@ -0,0 +1 @@
+a19be47ecca1a061349dc2d019ab6f2741ff1dee

plugins/ingest-attachment/licenses/tika-parser-xml-module-3.2.2.jar.sha1

@@ -0,0 +1 @@
+9dd2f1c52ab2663600e82dae3a8003ce6ede372f

plugins/ingest-attachment/licenses/tika-parser-xmp-commons-3.2.2.jar.sha1

@@ -0,0 +1 @@
+f1dfa02a2c672153013d44501e0c21d5682aa822

plugins/ingest-attachment/licenses/tika-parser-zip-commons-3.2.2.jar.sha1

@@ -0,0 +1 @@
+d46b71ea5697f575c3febfd7343e5d8b2c338bd5

plugins/ingest-attachment/licenses/tika-parsers-standard-package-3.2.2.jar.sha1

@@ -0,0 +1 @@
+c91fb85f5ee46e2c1f1e3399b04efb9d1ff85485

plugins/ingest-attachment/src/main/java/org/opensearch/ingest/attachment/TikaImpl.java

@@ -91,7 +91,7 @@ final class TikaImpl {
     /** subset of parsers for types we support */
     private static final Parser PARSERS[] = new Parser[] {
         // documents
-        new org.apache.tika.parser.html.HtmlParser(),
+        new org.apache.tika.parser.html.JSoupParser(),
         new org.apache.tika.parser.pdf.PDFParser(),
         new org.apache.tika.parser.txt.TXTParser(),
         new org.apache.tika.parser.microsoft.rtf.RTFParser(),

plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy

@@ -43,4 +43,6 @@ grant {
   permission java.lang.RuntimePermission "accessDeclaredMembers";
   // PDFBox checks for the existence of this class
   permission java.lang.RuntimePermission "accessClassInPackage.sun.java2d.cmm.kcms";
+  permission java.io.FilePermission "/System/Library/Fonts/-", "read";
+  permission java.io.FilePermission "/Library/Fonts/-", "read";
 };