Upgraded Tika and xmlbeans libraries

Tika libraries have been upgraded from 2.2.1 to 2.3.0. xmlbeans is now a subproject of POI, so POI was upgraded from 4.1.2 to 5.2.2. With POI 5.x the ooxml-schemas library has been moved to ooxml-lite/ooxml-full. Since ooxml-schemas no longer exists, the LICENSE and NOTICE files in the licenses/ directory have been removed. Finally, xmlbeans has been updated from 3.1.0 to 5.0.2 Signed-off-by: Kartik Ganesh <[email protected]>
opensearch-project · May 3, 2022 · 138335b · 138335b
1 parent 246a885
commit 138335b
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 497 deletions.
diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle
@@ -38,9 +38,9 @@ opensearchplugin {
 }
 
 versions << [
-  'tika'  : '2.2.1',
+  'tika'  : '2.3.0',
   'pdfbox': '2.0.25',
-  'poi'   : '4.1.2',
+  'poi'   : '5.2.2',
   'mime4j': '0.8.3'
 ]
 
@@ -70,9 +70,9 @@ dependencies {
   // OpenOffice
   api "org.apache.poi:poi-ooxml:${versions.poi}"
   api "org.apache.poi:poi:${versions.poi}"
-  api "org.apache.poi:poi-ooxml-schemas:${versions.poi}"
+  api "org.apache.poi:poi-ooxml-lite:${versions.poi}"
   api "commons-codec:commons-codec:${versions.commonscodec}"
-  api 'org.apache.xmlbeans:xmlbeans:3.1.0'
+  api 'org.apache.xmlbeans:xmlbeans:5.0.2'
   api 'org.apache.commons:commons-collections4:4.1'
   // MS Office
   api "org.apache.poi:poi-scratchpad:${versions.poi}"
@@ -98,6 +98,7 @@ restResources {
 tasks.named("dependencyLicenses").configure {
   mapping from: /apache-mime4j-.*/, to: 'apache-mime4j'
   mapping from: /tika-parsers-.*/, to: 'tika-parsers'
+  mapping from: /poi-ooxml-.*/, to: 'poi-ooxml'
 }
 
 forbiddenPatterns {

diff --git a/plugins/ingest-attachment/licenses/poi-4.1.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-4.1.2.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/poi-5.2.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-5.2.2.jar.sha1
@@ -0,0 +1 @@
+5513d31545085c33809c4b6553c2009fd19a6016
diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-4.1.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-4.1.2.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-5.2.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-5.2.2.jar.sha1
@@ -0,0 +1 @@
+a201b5bdc92c0fae4bed4b8e5546388c4c2f9eb0
diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.2.jar.sha1
@@ -0,0 +1 @@
+5df31b69375131fc2163a5557093cb112be90ce1
diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-schemas-4.1.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-schemas-4.1.2.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-schemas-LICENSE.txt b/plugins/ingest-attachment/licenses/poi-ooxml-schemas-LICENSE.txt
diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-schemas-NOTICE.txt b/plugins/ingest-attachment/licenses/poi-ooxml-schemas-NOTICE.txt
diff --git a/plugins/ingest-attachment/licenses/poi-scratchpad-4.1.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-scratchpad-4.1.2.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.2.jar.sha1 b/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.2.jar.sha1
@@ -0,0 +1 @@
+8c5cd5f1b3e7b3656ab983b73bbbf8bf5f14f793
diff --git a/plugins/ingest-attachment/licenses/tika-core-2.2.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-2.2.1.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/tika-core-2.3.0.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-2.3.0.jar.sha1
@@ -0,0 +1 @@
+aaed656e1acf142da412d468405038104c0cf38b
diff --git a/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.2.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.2.1.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.3.0.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.3.0.jar.sha1
@@ -0,0 +1 @@
+7be308dc50787ae8b8c242539be8f9ed1a23eba6
diff --git a/plugins/ingest-attachment/licenses/xmlbeans-3.1.0.jar.sha1 b/plugins/ingest-attachment/licenses/xmlbeans-3.1.0.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/xmlbeans-5.0.2.jar.sha1 b/plugins/ingest-attachment/licenses/xmlbeans-5.0.2.jar.sha1
@@ -0,0 +1 @@
+ac85f740e3492e28662cf5595d67113ffadc547d