diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 6cf8f484933c8..28f0b285f86d8 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -42,7 +42,7 @@ httpasyncclient = 4.1.5 commonslogging = 1.2 commonscodec = 1.16.1 commonslang = 3.14.0 -commonscompress = 1.26.0 +commonscompress = 1.26.1 # plugin dependencies aws = 2.20.86 reactivestreams = 1.0.4 diff --git a/distribution/tools/plugin-cli/licenses/commons-compress-1.26.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/commons-compress-1.26.0.jar.sha1 deleted file mode 100644 index b423eef4498af..0000000000000 --- a/distribution/tools/plugin-cli/licenses/commons-compress-1.26.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -659feffdd12280201c8aacb8f7be94f9a883c824 \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/commons-compress-1.26.1.jar.sha1 b/distribution/tools/plugin-cli/licenses/commons-compress-1.26.1.jar.sha1 new file mode 100644 index 0000000000000..912bda85de18a --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/commons-compress-1.26.1.jar.sha1 @@ -0,0 +1 @@ +44331c1130c370e726a2e1a3e6fba6d2558ef04a \ No newline at end of file diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index 6da34c4c9caf2..46877d558ae22 100644 --- a/plugins/ingest-attachment/build.gradle +++ b/plugins/ingest-attachment/build.gradle @@ -38,7 +38,7 @@ opensearchplugin { } versions << [ - 'tika' : '2.6.0', + 'tika' : '2.9.1', 'pdfbox': '2.0.27', 'poi' : '5.2.3', 'mime4j': '0.8.8' @@ -50,6 +50,16 @@ dependencies { api "org.apache.tika:tika-parsers:${versions.tika}" // Required for the various document parsers api "org.apache.tika:tika-parsers-standard-package:${versions.tika}" + api "org.apache.tika:tika-parser-apple-module:${versions.tika}" + api "org.apache.tika:tika-parser-html-module:${versions.tika}" + api "org.apache.tika:tika-parser-microsoft-module:${versions.tika}" + api "org.apache.tika:tika-parser-miscoffice-module:${versions.tika}" + api "org.apache.tika:tika-parser-pdf-module:${versions.tika}" + api "org.apache.tika:tika-parser-text-module:${versions.tika}" + api "org.apache.tika:tika-parser-xml-module:${versions.tika}" + // Utilities consumed by document parsers + api "org.apache.tika:tika-parser-xmp-commons:${versions.tika}" + api "org.apache.tika:tika-parser-zip-commons:${versions.tika}" // Required for language detection api "org.apache.tika:tika-langdetect-optimaize:${versions.tika}" // Optimaize libraries/dependencies diff --git a/plugins/ingest-attachment/licenses/commons-compress-1.26.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-compress-1.26.0.jar.sha1 deleted file mode 100644 index b423eef4498af..0000000000000 --- a/plugins/ingest-attachment/licenses/commons-compress-1.26.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -659feffdd12280201c8aacb8f7be94f9a883c824 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/commons-compress-1.26.1.jar.sha1 b/plugins/ingest-attachment/licenses/commons-compress-1.26.1.jar.sha1 new file mode 100644 index 0000000000000..912bda85de18a --- /dev/null +++ b/plugins/ingest-attachment/licenses/commons-compress-1.26.1.jar.sha1 @@ -0,0 +1 @@ +44331c1130c370e726a2e1a3e6fba6d2558ef04a \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-core-2.6.0.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-2.6.0.jar.sha1 deleted file mode 100644 index c66c2f3f39401..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-core-2.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f6ed6356dd4a9bd269d873f65494376685e6192e \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-core-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..d84bac7939661 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-core-2.9.1.jar.sha1 @@ -0,0 +1 @@ +bfd572826e7023dd6ceeefe1b4d0f6d3d8eef507 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.6.0.jar.sha1 b/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.6.0.jar.sha1 deleted file mode 100644 index e7bc59bb5ae49..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72b784a7bdab0ffde005fa64d15e3f077331d6fc \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..11ac5636b8beb --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.1.jar.sha1 @@ -0,0 +1 @@ +eca26cf8b8576323722c7fe282ace9a379f87d07 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..5fc330cffec07 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.1.jar.sha1 @@ -0,0 +1 @@ +919fd2869c4bdccb0d16438eabfd3f516cc5c1db \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..93ef1be7bec70 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.1.jar.sha1 @@ -0,0 +1 @@ +d246a3a2c44cb682af0d9205d73938af2a080c2d \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..0cd872f218d04 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.1.jar.sha1 @@ -0,0 +1 @@ +eb4150db6d63709abc8fc8989838a5b404992a1b \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..f2b4dbf872e59 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.1.jar.sha1 @@ -0,0 +1 @@ +3b723ba5e7aee3a3c10cb454e8910a85c09eb010 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..4eb43d64b8404 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.1.jar.sha1 @@ -0,0 +1 @@ +04f05429ef7948aadd9662e9ef3088118b3dfd57 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..2774266c0ca9b --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.1.jar.sha1 @@ -0,0 +1 @@ +105b75bfc302f6a3dbf3e5b328e48fa53dcf4f8a \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..4ef62fda030c0 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.1.jar.sha1 @@ -0,0 +1 @@ +aa2eae90cfc929703413026457f5f6d15d997796 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..a215be780da9e --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 @@ -0,0 +1 @@ +f0ab0cd63aa1e72effff8071e1cbb5a3698e1c30 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..2b19b56d4582b --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.1.jar.sha1 @@ -0,0 +1 @@ +2c06ac859bc325a8468a98cb5714b3c4471427af \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.6.0.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.6.0.jar.sha1 deleted file mode 100644 index 83c0777fcbe8a..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -00980e70b1df13c1236b750f0ca1462edd5d7417 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.1.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.1.jar.sha1 new file mode 100644 index 0000000000000..ac18544574c74 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.1.jar.sha1 @@ -0,0 +1 @@ +6ecb2da95ee371139fbab64dbc784ca6e77e2a3c \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/commons-compress-1.26.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-compress-1.26.0.jar.sha1 deleted file mode 100644 index b423eef4498af..0000000000000 --- a/plugins/repository-hdfs/licenses/commons-compress-1.26.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -659feffdd12280201c8aacb8f7be94f9a883c824 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/commons-compress-1.26.1.jar.sha1 b/plugins/repository-hdfs/licenses/commons-compress-1.26.1.jar.sha1 new file mode 100644 index 0000000000000..912bda85de18a --- /dev/null +++ b/plugins/repository-hdfs/licenses/commons-compress-1.26.1.jar.sha1 @@ -0,0 +1 @@ +44331c1130c370e726a2e1a3e6fba6d2558ef04a \ No newline at end of file