From 19076ce33e8011e3704a6a4c539172c042600b55 Mon Sep 17 00:00:00 2001 From: Aman Khare Date: Tue, 12 Mar 2024 11:22:18 +0530 Subject: [PATCH 01/17] Bump up commons-compress to 1.26.0 to fix CVE Signed-off-by: Aman Khare --- buildSrc/build.gradle | 2 +- buildSrc/version.properties | 2 +- .../tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 | 1 - .../tools/plugin-cli/licenses/commons-compress-1.26.0.jar.sha1 | 1 + .../ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 | 1 - .../ingest-attachment/licenses/commons-compress-1.26.0.jar.sha1 | 1 + .../repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 | 1 - .../repository-hdfs/licenses/commons-compress-1.26.0.jar.sha1 | 1 + 8 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 distribution/tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 create mode 100644 distribution/tools/plugin-cli/licenses/commons-compress-1.26.0.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/commons-compress-1.26.0.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/commons-compress-1.26.0.jar.sha1 diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 0562ecc6ee61b..1a95ecce3c8a8 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -103,7 +103,7 @@ dependencies { api localGroovy() api 'commons-codec:commons-codec:1.16.0' - api 'org.apache.commons:commons-compress:1.25.0' + api "org.apache.commons:commons-compress:${props.getProperty('commonscompress')}" api 'org.apache.ant:ant:1.10.14' api 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0' api 'com.netflix.nebula:nebula-publishing-plugin:21.0.0' diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 5c9cd25bb79ad..a6039db25a8a1 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -42,7 +42,7 @@ httpasyncclient = 4.1.5 commonslogging = 1.2 commonscodec = 1.15 commonslang = 3.13.0 -commonscompress = 1.24.0 +commonscompress = 1.26.0 # plugin dependencies aws = 2.20.86 reactivestreams = 1.0.4 diff --git a/distribution/tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 deleted file mode 100644 index 23999d1bfbde4..0000000000000 --- a/distribution/tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b4b1b5a3d9573b2970fddab236102c0a4d27d35e \ No newline at end of file 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 new file mode 100644 index 0000000000000..b423eef4498af --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/commons-compress-1.26.0.jar.sha1 @@ -0,0 +1 @@ +659feffdd12280201c8aacb8f7be94f9a883c824 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 deleted file mode 100644 index 23999d1bfbde4..0000000000000 --- a/plugins/ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b4b1b5a3d9573b2970fddab236102c0a4d27d35e \ No newline at end of file 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 new file mode 100644 index 0000000000000..b423eef4498af --- /dev/null +++ b/plugins/ingest-attachment/licenses/commons-compress-1.26.0.jar.sha1 @@ -0,0 +1 @@ +659feffdd12280201c8aacb8f7be94f9a883c824 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 deleted file mode 100644 index 23999d1bfbde4..0000000000000 --- a/plugins/repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b4b1b5a3d9573b2970fddab236102c0a4d27d35e \ 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 new file mode 100644 index 0000000000000..b423eef4498af --- /dev/null +++ b/plugins/repository-hdfs/licenses/commons-compress-1.26.0.jar.sha1 @@ -0,0 +1 @@ +659feffdd12280201c8aacb8f7be94f9a883c824 \ No newline at end of file From c8e45cf99ac6ba9532c0b29cb95735bc4097a8ec Mon Sep 17 00:00:00 2001 From: Aman Khare Date: Tue, 12 Mar 2024 11:31:11 +0530 Subject: [PATCH 02/17] Change log entry Signed-off-by: Aman Khare --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e7652bf00462..5e159107884e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.bouncycastle:bcpkix-jdk15to18` to `org.bouncycastle:bcpkix-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317)) - Bump Jackson version from 2.16.1 to 2.16.2 ([#12611](https://github.com/opensearch-project/OpenSearch/pull/12611)) - Bump `aws-sdk-java` from 2.20.55 to 2.20.86 ([#12251](https://github.com/opensearch-project/OpenSearch/pull/12251)) +- Bump `org.apache.commons:commons-compress` from 1.24.0 to 1.26.0 ([#12604](https://github.com/opensearch-project/OpenSearch/pull/12604)) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) From 734cb985ab213942818e38b7db062dbf18d51c11 Mon Sep 17 00:00:00 2001 From: Aman Khare Date: Tue, 12 Mar 2024 14:10:40 +0530 Subject: [PATCH 03/17] Update ignoreMissingClasses Signed-off-by: Aman Khare --- distribution/tools/plugin-cli/build.gradle | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index f40fb1c4b0a9f..d532e66ae73e1 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -104,5 +104,22 @@ thirdPartyAudit.ignoreMissingClasses( 'org.tukaani.xz.MemoryLimitException', 'org.tukaani.xz.UnsupportedOptionsException', 'org.tukaani.xz.XZ', - 'org.tukaani.xz.XZOutputStream' + 'org.tukaani.xz.XZOutputStream', + 'org.apache.commons.codec.Charsets', + 'org.apache.commons.codec.digest.PureJavaCrc32C', + 'org.apache.commons.codec.digest.XXHash32', + 'org.apache.commons.io.Charsets', + 'org.apache.commons.io.FileUtils', + 'org.apache.commons.io.FilenameUtils', + 'org.apache.commons.io.IOUtils', + 'org.apache.commons.io.build.AbstractOrigin', + 'org.apache.commons.io.build.AbstractStreamBuilder', + 'org.apache.commons.io.file.attribute.FileTimes', + 'org.apache.commons.io.input.BoundedInputStream', + 'org.apache.commons.io.input.CloseShieldInputStream', + 'org.apache.commons.io.input.CountingInputStream', + 'org.apache.commons.io.input.NullInputStream', + 'org.apache.commons.io.output.CountingOutputStream', + 'org.apache.commons.io.output.NullOutputStream', + 'org.apache.commons.lang3.reflect.FieldUtils' ) From ff6ad98415c476eb9e4e644a6412f83058e0a24e Mon Sep 17 00:00:00 2001 From: Aman Khare Date: Tue, 12 Mar 2024 17:32:21 +0530 Subject: [PATCH 04/17] Update commons-codec and commons-lang3 dependencies also Signed-off-by: Aman Khare --- buildSrc/version.properties | 4 ++-- client/rest/licenses/commons-codec-1.15.jar.sha1 | 1 - client/rest/licenses/commons-codec-1.16.1.jar.sha1 | 1 + client/sniffer/licenses/commons-codec-1.15.jar.sha1 | 1 - client/sniffer/licenses/commons-codec-1.16.1.jar.sha1 | 1 + .../analysis-phonetic/licenses/commons-codec-1.15.jar.sha1 | 1 - .../analysis-phonetic/licenses/commons-codec-1.16.1.jar.sha1 | 1 + plugins/crypto-kms/licenses/commons-codec-1.15.jar.sha1 | 1 - plugins/crypto-kms/licenses/commons-codec-1.16.1.jar.sha1 | 1 + .../licenses/commons-codec-1.15.jar.sha1 | 1 - .../licenses/commons-codec-1.16.1.jar.sha1 | 1 + plugins/discovery-ec2/licenses/commons-codec-1.15.jar.sha1 | 1 - plugins/discovery-ec2/licenses/commons-codec-1.16.1.jar.sha1 | 1 + plugins/discovery-gce/licenses/commons-codec-1.15.jar.sha1 | 1 - plugins/discovery-gce/licenses/commons-codec-1.16.1.jar.sha1 | 1 + .../ingest-attachment/licenses/commons-codec-1.15.jar.sha1 | 1 - .../ingest-attachment/licenses/commons-codec-1.16.1.jar.sha1 | 1 + .../ingest-attachment/licenses/commons-lang3-3.13.0.jar.sha1 | 1 - .../ingest-attachment/licenses/commons-lang3-3.14.0.jar.sha1 | 1 + .../repository-azure/licenses/commons-lang3-3.13.0.jar.sha1 | 1 - .../repository-azure/licenses/commons-lang3-3.14.0.jar.sha1 | 1 + plugins/repository-gcs/licenses/commons-codec-1.15.jar.sha1 | 1 - plugins/repository-gcs/licenses/commons-codec-1.16.1.jar.sha1 | 1 + plugins/repository-hdfs/licenses/commons-codec-1.15.jar.sha1 | 1 - .../repository-hdfs/licenses/commons-codec-1.16.1.jar.sha1 | 1 + plugins/repository-s3/licenses/commons-codec-1.15.jar.sha1 | 1 - plugins/repository-s3/licenses/commons-codec-1.16.1.jar.sha1 | 1 + 27 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 client/rest/licenses/commons-codec-1.15.jar.sha1 create mode 100644 client/rest/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 client/sniffer/licenses/commons-codec-1.15.jar.sha1 create mode 100644 client/sniffer/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/crypto-kms/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/crypto-kms/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/discovery-azure-classic/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/discovery-azure-classic/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/discovery-gce/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/discovery-gce/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/commons-lang3-3.13.0.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/commons-lang3-3.14.0.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/commons-lang3-3.13.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/commons-lang3-3.14.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/commons-codec-1.16.1.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/commons-codec-1.15.jar.sha1 create mode 100644 plugins/repository-s3/licenses/commons-codec-1.16.1.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index a6039db25a8a1..913731245eebb 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -40,8 +40,8 @@ httpclient = 4.5.14 httpcore = 4.4.16 httpasyncclient = 4.1.5 commonslogging = 1.2 -commonscodec = 1.15 -commonslang = 3.13.0 +commonscodec = 1.16.1 +commonslang = 3.14.0 commonscompress = 1.26.0 # plugin dependencies aws = 2.20.86 diff --git a/client/rest/licenses/commons-codec-1.15.jar.sha1 b/client/rest/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/client/rest/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/client/rest/licenses/commons-codec-1.16.1.jar.sha1 b/client/rest/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/client/rest/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/client/sniffer/licenses/commons-codec-1.15.jar.sha1 b/client/sniffer/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/client/sniffer/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/client/sniffer/licenses/commons-codec-1.16.1.jar.sha1 b/client/sniffer/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/client/sniffer/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/commons-codec-1.15.jar.sha1 b/plugins/analysis-phonetic/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/analysis-phonetic/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/analysis-phonetic/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/crypto-kms/licenses/commons-codec-1.15.jar.sha1 b/plugins/crypto-kms/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/crypto-kms/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/crypto-kms/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/crypto-kms/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/crypto-kms/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/commons-codec-1.15.jar.sha1 b/plugins/discovery-azure-classic/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/discovery-azure-classic/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/discovery-azure-classic/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/commons-codec-1.15.jar.sha1 b/plugins/discovery-ec2/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/discovery-ec2/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/discovery-ec2/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/discovery-ec2/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/commons-codec-1.15.jar.sha1 b/plugins/discovery-gce/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/discovery-gce/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/discovery-gce/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/discovery-gce/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/commons-codec-1.15.jar.sha1 b/plugins/ingest-attachment/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/ingest-attachment/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/ingest-attachment/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/ingest-attachment/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/commons-lang3-3.13.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-lang3-3.13.0.jar.sha1 deleted file mode 100644 index d0c2f2486ee1f..0000000000000 --- a/plugins/ingest-attachment/licenses/commons-lang3-3.13.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b7263237aa89c1f99b327197c41d0669707a462e \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/commons-lang3-3.14.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-lang3-3.14.0.jar.sha1 new file mode 100644 index 0000000000000..d783e07e40902 --- /dev/null +++ b/plugins/ingest-attachment/licenses/commons-lang3-3.14.0.jar.sha1 @@ -0,0 +1 @@ +1ed471194b02f2c6cb734a0cd6f6f107c673afae \ No newline at end of file diff --git a/plugins/repository-azure/licenses/commons-lang3-3.13.0.jar.sha1 b/plugins/repository-azure/licenses/commons-lang3-3.13.0.jar.sha1 deleted file mode 100644 index d0c2f2486ee1f..0000000000000 --- a/plugins/repository-azure/licenses/commons-lang3-3.13.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b7263237aa89c1f99b327197c41d0669707a462e \ No newline at end of file diff --git a/plugins/repository-azure/licenses/commons-lang3-3.14.0.jar.sha1 b/plugins/repository-azure/licenses/commons-lang3-3.14.0.jar.sha1 new file mode 100644 index 0000000000000..d783e07e40902 --- /dev/null +++ b/plugins/repository-azure/licenses/commons-lang3-3.14.0.jar.sha1 @@ -0,0 +1 @@ +1ed471194b02f2c6cb734a0cd6f6f107c673afae \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/commons-codec-1.15.jar.sha1 b/plugins/repository-gcs/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/repository-gcs/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/repository-gcs/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/repository-gcs/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/commons-codec-1.15.jar.sha1 b/plugins/repository-hdfs/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/repository-hdfs/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/repository-hdfs/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/repository-hdfs/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/commons-codec-1.15.jar.sha1 b/plugins/repository-s3/licenses/commons-codec-1.15.jar.sha1 deleted file mode 100644 index 62d99837b87e1..0000000000000 --- a/plugins/repository-s3/licenses/commons-codec-1.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d \ No newline at end of file diff --git a/plugins/repository-s3/licenses/commons-codec-1.16.1.jar.sha1 b/plugins/repository-s3/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/plugins/repository-s3/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file From c7b5a0b5a3d63a38b8fafce97cdd82e47b6d4315 Mon Sep 17 00:00:00 2001 From: Aman Khare Date: Tue, 12 Mar 2024 19:37:50 +0530 Subject: [PATCH 05/17] Upgrade commons-codec to 1.16.1 Signed-off-by: Aman Khare --- buildSrc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1a95ecce3c8a8..4c9fab99fef21 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -102,7 +102,7 @@ dependencies { api localGroovy() - api 'commons-codec:commons-codec:1.16.0' + api "commons-codec:commons-codec:${props.getProperty('commonscodec')}" api "org.apache.commons:commons-compress:${props.getProperty('commonscompress')}" api 'org.apache.ant:ant:1.10.14' api 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0' From af53432ae98e2af378163ae73c71165edb956296 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 12 Mar 2024 15:45:02 -0700 Subject: [PATCH 06/17] Add commons-io dependency in plugin-cli build.gradle Signed-off-by: Sandesh Kumar --- distribution/tools/plugin-cli/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index d532e66ae73e1..107b2dbd762a7 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -52,6 +52,10 @@ tasks.named("dependencyLicenses").configure { mapping from: /bc.*/, to: 'bouncycastle' } +dependencies { + api 'commons-io:commons-io:2.15.1' +} + test { // TODO: find a way to add permissions for the tests in this module systemProperty 'tests.security.manager', 'false' From 483743d8a3b4450a81af2515119054f8db181bf0 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 12 Mar 2024 15:45:19 -0700 Subject: [PATCH 07/17] Revert "Update ignoreMissingClasses" This reverts commit d92fbdafdccf9c01f6e628568770ad9f6e85aaaa. Signed-off-by: Sandesh Kumar --- distribution/tools/plugin-cli/build.gradle | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 107b2dbd762a7..c08c87dd9ca4a 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -108,22 +108,5 @@ thirdPartyAudit.ignoreMissingClasses( 'org.tukaani.xz.MemoryLimitException', 'org.tukaani.xz.UnsupportedOptionsException', 'org.tukaani.xz.XZ', - 'org.tukaani.xz.XZOutputStream', - 'org.apache.commons.codec.Charsets', - 'org.apache.commons.codec.digest.PureJavaCrc32C', - 'org.apache.commons.codec.digest.XXHash32', - 'org.apache.commons.io.Charsets', - 'org.apache.commons.io.FileUtils', - 'org.apache.commons.io.FilenameUtils', - 'org.apache.commons.io.IOUtils', - 'org.apache.commons.io.build.AbstractOrigin', - 'org.apache.commons.io.build.AbstractStreamBuilder', - 'org.apache.commons.io.file.attribute.FileTimes', - 'org.apache.commons.io.input.BoundedInputStream', - 'org.apache.commons.io.input.CloseShieldInputStream', - 'org.apache.commons.io.input.CountingInputStream', - 'org.apache.commons.io.input.NullInputStream', - 'org.apache.commons.io.output.CountingOutputStream', - 'org.apache.commons.io.output.NullOutputStream', - 'org.apache.commons.lang3.reflect.FieldUtils' + 'org.tukaani.xz.XZOutputStream' ) From eb3f4d966adf3fa25304464f5028b4fd811bc422 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 12 Mar 2024 16:24:43 -0700 Subject: [PATCH 08/17] Adding SHA for commons-io-2.15.1.jar Signed-off-by: Sandesh Kumar --- .../tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 diff --git a/distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 b/distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 new file mode 100644 index 0000000000000..47c5d13812a36 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 @@ -0,0 +1 @@ +f11560da189ab563a5c8e351941415430e9304ea \ No newline at end of file From 837a7c123faac83c60232a9c572780609e7e74ca Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 12 Mar 2024 17:52:20 -0700 Subject: [PATCH 09/17] adding license, notice files for commons-io Signed-off-by: Sandesh Kumar --- .../licenses/commons-io-LICENSE.txt | 202 ++++++++++++++++++ .../plugin-cli/licenses/commons-io-NOTICE.txt | 5 + 2 files changed, 207 insertions(+) create mode 100644 distribution/tools/plugin-cli/licenses/commons-io-LICENSE.txt create mode 100644 distribution/tools/plugin-cli/licenses/commons-io-NOTICE.txt diff --git a/distribution/tools/plugin-cli/licenses/commons-io-LICENSE.txt b/distribution/tools/plugin-cli/licenses/commons-io-LICENSE.txt new file mode 100644 index 0000000000000..d645695673349 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/commons-io-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/distribution/tools/plugin-cli/licenses/commons-io-NOTICE.txt b/distribution/tools/plugin-cli/licenses/commons-io-NOTICE.txt new file mode 100644 index 0000000000000..a6b77d1eb6089 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/commons-io-NOTICE.txt @@ -0,0 +1,5 @@ +Apache Commons IO +Copyright 2002-2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). From a0f58db2596f7e573edeecc9752497f7cc544ab3 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 12 Mar 2024 18:12:47 -0700 Subject: [PATCH 10/17] Add missing classes for thirdPartyAudit Signed-off-by: Sandesh Kumar --- distribution/tools/plugin-cli/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index c08c87dd9ca4a..a33e72effd5a2 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -108,5 +108,9 @@ thirdPartyAudit.ignoreMissingClasses( 'org.tukaani.xz.MemoryLimitException', 'org.tukaani.xz.UnsupportedOptionsException', 'org.tukaani.xz.XZ', - 'org.tukaani.xz.XZOutputStream' + 'org.tukaani.xz.XZOutputStream', + 'org.apache.commons.codec.Charsets', + 'org.apache.commons.codec.digest.PureJavaCrc32C', + 'org.apache.commons.codec.digest.XXHash32', + 'org.apache.commons.lang3.reflect.FieldUtils' ) From 0ab41fe2bdde97d21ec787ab0f5a0eb2631b3c17 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 12 Mar 2024 22:30:34 -0700 Subject: [PATCH 11/17] Refactor Signed-off-by: Sandesh Kumar --- distribution/tools/plugin-cli/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index a33e72effd5a2..5ddb81a1e7a55 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -44,7 +44,7 @@ dependencies { testRuntimeOnly("com.google.guava:guava:${versions.guava}") { transitive = false } - + api "commons-io:commons-io:2.15.1" implementation "org.apache.commons:commons-compress:${versions.commonscompress}" } @@ -52,10 +52,6 @@ tasks.named("dependencyLicenses").configure { mapping from: /bc.*/, to: 'bouncycastle' } -dependencies { - api 'commons-io:commons-io:2.15.1' -} - test { // TODO: find a way to add permissions for the tests in this module systemProperty 'tests.security.manager', 'false' From 50798eeb39ff5f412b1904a012e23e3e2a185bd9 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Thu, 14 Mar 2024 14:04:13 -0700 Subject: [PATCH 12/17] Test commit - to be reverted Signed-off-by: Sandesh Kumar --- .../java/org/opensearch/ingest/attachment/TikaDocTests.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java b/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java index 7f4a9b8ca0ac7..d771b23aea123 100644 --- a/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java +++ b/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java @@ -65,6 +65,11 @@ public void testFiles() throws Exception { try (DirectoryStream stream = Files.newDirectoryStream(tmp)) { for (Path doc : stream) { + // Testing change with skipping - will remove in final code + if (doc.toString().endsWith(".pages") || doc.toString().endsWith(".key")) { + logger.debug("skipping: {}", doc); + continue; + } logger.debug("parsing: {}", doc); assertParseable(doc); } From 788eebb682b629150e5b2564fb8faabef502a6cc Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Wed, 20 Mar 2024 14:27:50 -0700 Subject: [PATCH 13/17] Bump commons-compress to 1.26.1, tika to 2.9.1 Signed-off-by: Sandesh Kumar --- buildSrc/version.properties | 2 +- .../licenses/commons-compress-1.26.0.jar.sha1 | 1 - .../licenses/commons-compress-1.26.1.jar.sha1 | 1 + plugins/ingest-attachment/build.gradle | 12 +++++++++++- .../licenses/commons-compress-1.26.0.jar.sha1 | 1 - .../licenses/commons-compress-1.26.1.jar.sha1 | 1 + .../licenses/tika-core-2.6.0.jar.sha1 | 1 - .../licenses/tika-core-2.9.1.jar.sha1 | 1 + .../tika-langdetect-optimaize-2.6.0.jar.sha1 | 1 - .../tika-langdetect-optimaize-2.9.1.jar.sha1 | 1 + .../licenses/tika-parser-apple-module-2.9.1.jar.sha1 | 1 + .../licenses/tika-parser-html-module-2.9.1.jar.sha1 | 1 + .../tika-parser-microsoft-module-2.9.1.jar.sha1 | 1 + .../tika-parser-miscoffice-module-2.9.1.jar.sha1 | 1 + .../licenses/tika-parser-pdf-module-2.9.1.jar.sha1 | 1 + .../licenses/tika-parser-text-module-2.9.1.jar.sha1 | 1 + .../licenses/tika-parser-xml-module-2.9.1.jar.sha1 | 1 + .../licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 | 1 + .../licenses/tika-parser-zip-commons-2.9.1.jar.sha1 | 1 + .../tika-parsers-standard-package-2.6.0.jar.sha1 | 1 - .../tika-parsers-standard-package-2.9.1.jar.sha1 | 1 + .../licenses/commons-compress-1.26.0.jar.sha1 | 1 - .../licenses/commons-compress-1.26.1.jar.sha1 | 1 + 23 files changed, 27 insertions(+), 8 deletions(-) delete mode 100644 distribution/tools/plugin-cli/licenses/commons-compress-1.26.0.jar.sha1 create mode 100644 distribution/tools/plugin-cli/licenses/commons-compress-1.26.1.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/commons-compress-1.26.0.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/commons-compress-1.26.1.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-core-2.6.0.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-core-2.9.1.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.6.0.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.1.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.6.0.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.1.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/commons-compress-1.26.0.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/commons-compress-1.26.1.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 913731245eebb..842d98682f62e 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 a931f45802318..496829c90595d 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 From 16c6977eea2bb0f5d20eb5ef0ebaa7cea5c26fa0 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Wed, 20 Mar 2024 15:05:06 -0700 Subject: [PATCH 14/17] Remove Charsets class from exclusion list - not missing Signed-off-by: Sandesh Kumar --- distribution/tools/plugin-cli/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 5ddb81a1e7a55..2c5c5b23dd944 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -105,7 +105,6 @@ thirdPartyAudit.ignoreMissingClasses( 'org.tukaani.xz.UnsupportedOptionsException', 'org.tukaani.xz.XZ', 'org.tukaani.xz.XZOutputStream', - 'org.apache.commons.codec.Charsets', 'org.apache.commons.codec.digest.PureJavaCrc32C', 'org.apache.commons.codec.digest.XXHash32', 'org.apache.commons.lang3.reflect.FieldUtils' From 86977e83c4edb591462eb5ee4ea81043a2f2381f Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 2 Apr 2024 14:42:33 -0700 Subject: [PATCH 15/17] Update tika to 2.9.2 Signed-off-by: Sandesh Kumar --- CHANGELOG.md | 5 ++++- plugins/ingest-attachment/build.gradle | 8 ++++---- .../licenses/apache-mime4j-core-0.8.11.jar.sha1 | 1 + .../licenses/apache-mime4j-core-0.8.8.jar.sha1 | 1 - .../licenses/apache-mime4j-dom-0.8.11.jar.sha1 | 1 + .../licenses/apache-mime4j-dom-0.8.8.jar.sha1 | 1 - .../ingest-attachment/licenses/fontbox-2.0.27.jar.sha1 | 1 - .../ingest-attachment/licenses/fontbox-2.0.31.jar.sha1 | 1 + plugins/ingest-attachment/licenses/pdfbox-2.0.27.jar.sha1 | 1 - plugins/ingest-attachment/licenses/pdfbox-2.0.31.jar.sha1 | 1 + plugins/ingest-attachment/licenses/poi-5.2.3.jar.sha1 | 1 - plugins/ingest-attachment/licenses/poi-5.2.5.jar.sha1 | 1 + .../ingest-attachment/licenses/poi-ooxml-5.2.3.jar.sha1 | 1 - .../ingest-attachment/licenses/poi-ooxml-5.2.5.jar.sha1 | 1 + .../licenses/poi-ooxml-lite-5.2.3.jar.sha1 | 1 - .../licenses/poi-ooxml-lite-5.2.5.jar.sha1 | 1 + .../licenses/poi-scratchpad-5.2.3.jar.sha1 | 1 - .../licenses/poi-scratchpad-5.2.5.jar.sha1 | 1 + .../ingest-attachment/licenses/tika-core-2.9.1.jar.sha1 | 1 - .../ingest-attachment/licenses/tika-core-2.9.2.jar.sha1 | 1 + .../licenses/tika-langdetect-optimaize-2.9.1.jar.sha1 | 1 - .../licenses/tika-langdetect-optimaize-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-apple-module-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-apple-module-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-html-module-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-html-module-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-microsoft-module-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-microsoft-module-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-miscoffice-module-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-miscoffice-module-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-pdf-module-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-pdf-module-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-text-module-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-text-module-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-xml-module-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-xml-module-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-xmp-commons-2.9.2.jar.sha1 | 1 + .../licenses/tika-parser-zip-commons-2.9.1.jar.sha1 | 1 - .../licenses/tika-parser-zip-commons-2.9.2.jar.sha1 | 1 + .../licenses/tika-parsers-standard-package-2.9.1.jar.sha1 | 1 - .../licenses/tika-parsers-standard-package-2.9.2.jar.sha1 | 1 + .../org/opensearch/ingest/attachment/TikaDocTests.java | 5 ----- 43 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.11.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.8.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.11.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.8.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/fontbox-2.0.27.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/fontbox-2.0.31.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/pdfbox-2.0.27.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/pdfbox-2.0.31.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/poi-5.2.3.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/poi-5.2.5.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/poi-ooxml-5.2.3.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/poi-ooxml-5.2.5.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.3.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.5.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/poi-scratchpad-5.2.3.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/poi-scratchpad-5.2.5.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-core-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-core-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.2.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.1.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.2.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e159107884e1..2bbc1a116397d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.bouncycastle:bcpkix-jdk15to18` to `org.bouncycastle:bcpkix-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317)) - Bump Jackson version from 2.16.1 to 2.16.2 ([#12611](https://github.com/opensearch-project/OpenSearch/pull/12611)) - Bump `aws-sdk-java` from 2.20.55 to 2.20.86 ([#12251](https://github.com/opensearch-project/OpenSearch/pull/12251)) -- Bump `org.apache.commons:commons-compress` from 1.24.0 to 1.26.0 ([#12604](https://github.com/opensearch-project/OpenSearch/pull/12604)) +- Bump `org.apache.commons:commons-compress` from 1.24.0 to 1.26.1 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) +- Bump `org.apache.commons:commonscodec` from 1.15 to 1.16.1 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) +- Bump `org.apache.commons:commonslang` from 3.13.0 to 3.14.0 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) +- Bump Apache Tika from 2.6.0 to 2.9.2 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index 496829c90595d..262dc9e0e8335 100644 --- a/plugins/ingest-attachment/build.gradle +++ b/plugins/ingest-attachment/build.gradle @@ -38,10 +38,10 @@ opensearchplugin { } versions << [ - 'tika' : '2.9.1', - 'pdfbox': '2.0.27', - 'poi' : '5.2.3', - 'mime4j': '0.8.8' + 'tika' : '2.9.2', + 'pdfbox': '2.0.31', + 'poi' : '5.2.5', + 'mime4j': '0.8.11' ] dependencies { diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.11.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.11.jar.sha1 new file mode 100644 index 0000000000000..82d9bf2617ce6 --- /dev/null +++ b/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.11.jar.sha1 @@ -0,0 +1 @@ +6d1eb5f7b84eaa9d38fca13b761f01c693aef3da \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.8.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.8.jar.sha1 deleted file mode 100644 index 77c36691d36b5..0000000000000 --- a/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7330de23c52f71617cbec7f1d2760dae32e687cd \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.11.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.11.jar.sha1 new file mode 100644 index 0000000000000..7a494aba6a231 --- /dev/null +++ b/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.11.jar.sha1 @@ -0,0 +1 @@ +f0d42ab9a5832b5f5d05afc004b31245b838e0fc \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.8.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.8.jar.sha1 deleted file mode 100644 index fb9c5fed27162..0000000000000 --- a/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e76715563a6bd150f84ccb0adb920aec8faf4779 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/fontbox-2.0.27.jar.sha1 b/plugins/ingest-attachment/licenses/fontbox-2.0.27.jar.sha1 deleted file mode 100644 index d578dffbfa3f6..0000000000000 --- a/plugins/ingest-attachment/licenses/fontbox-2.0.27.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d08c064d18b2b149da937d15c0d1708cba03f29d \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/fontbox-2.0.31.jar.sha1 b/plugins/ingest-attachment/licenses/fontbox-2.0.31.jar.sha1 new file mode 100644 index 0000000000000..d45d45a66e072 --- /dev/null +++ b/plugins/ingest-attachment/licenses/fontbox-2.0.31.jar.sha1 @@ -0,0 +1 @@ +96999ecdb7324bf718b88724818fa62f81286c36 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/pdfbox-2.0.27.jar.sha1 b/plugins/ingest-attachment/licenses/pdfbox-2.0.27.jar.sha1 deleted file mode 100644 index 4f670b7f95e8c..0000000000000 --- a/plugins/ingest-attachment/licenses/pdfbox-2.0.27.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -416a9dfce3714116bfdf793b15368df04266845f \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/pdfbox-2.0.31.jar.sha1 b/plugins/ingest-attachment/licenses/pdfbox-2.0.31.jar.sha1 new file mode 100644 index 0000000000000..fa256ed9a65d2 --- /dev/null +++ b/plugins/ingest-attachment/licenses/pdfbox-2.0.31.jar.sha1 @@ -0,0 +1 @@ +29b25053099bc30784a766ccb821417e06f4b8a1 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-5.2.3.jar.sha1 b/plugins/ingest-attachment/licenses/poi-5.2.3.jar.sha1 deleted file mode 100644 index 3d8b3daf606ad..0000000000000 --- a/plugins/ingest-attachment/licenses/poi-5.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2fb22ae74ad5aea6af1a9c64b9542f2ccf348604 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-5.2.5.jar.sha1 b/plugins/ingest-attachment/licenses/poi-5.2.5.jar.sha1 new file mode 100644 index 0000000000000..0eca17726eb0b --- /dev/null +++ b/plugins/ingest-attachment/licenses/poi-5.2.5.jar.sha1 @@ -0,0 +1 @@ +7e00f6b2f76375fe89022d5a7db8acb71cbd55f5 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-5.2.3.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-5.2.3.jar.sha1 deleted file mode 100644 index 8371593cf0841..0000000000000 --- a/plugins/ingest-attachment/licenses/poi-ooxml-5.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -02efd11c940adb18c03eb9ce7ad88fc40ee6a196 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-5.2.5.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-5.2.5.jar.sha1 new file mode 100644 index 0000000000000..6b14be4461425 --- /dev/null +++ b/plugins/ingest-attachment/licenses/poi-ooxml-5.2.5.jar.sha1 @@ -0,0 +1 @@ +df9f2c52371eeba24db8ea8cafa77285c3cc0742 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.3.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.3.jar.sha1 deleted file mode 100644 index 5c6365876b7be..0000000000000 --- a/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -db113c8e9051b0ff967f4911fa20336c8325a7c5 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.5.jar.sha1 b/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.5.jar.sha1 new file mode 100644 index 0000000000000..f9a473173a297 --- /dev/null +++ b/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.5.jar.sha1 @@ -0,0 +1 @@ +eaa61452d8f0d13080fbb4757a392f09f90e4c49 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.3.jar.sha1 b/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.3.jar.sha1 deleted file mode 100644 index 3c8f92498f1a4..0000000000000 --- a/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2a7fce47e22b7fedb1b277347ff4fe36d6eda50d \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.5.jar.sha1 b/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.5.jar.sha1 new file mode 100644 index 0000000000000..68665ddafd7d8 --- /dev/null +++ b/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.5.jar.sha1 @@ -0,0 +1 @@ +fc600cf765a49d73935a6e48a5b84f4abcdd0518 \ 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 deleted file mode 100644 index d84bac7939661..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-core-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bfd572826e7023dd6ceeefe1b4d0f6d3d8eef507 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-core-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..80635a63d29fe --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-core-2.9.2.jar.sha1 @@ -0,0 +1 @@ +796a21391780339e3d4862626339b49df170024e \ 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 deleted file mode 100644 index 11ac5636b8beb..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eca26cf8b8576323722c7fe282ace9a379f87d07 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..a4bb6d48c6a08 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-langdetect-optimaize-2.9.2.jar.sha1 @@ -0,0 +1 @@ +7a48a287e464b456a85c79f318d7bad7db201518 \ 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 deleted file mode 100644 index 5fc330cffec07..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -919fd2869c4bdccb0d16438eabfd3f516cc5c1db \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..dbaee880d1251 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.9.2.jar.sha1 @@ -0,0 +1 @@ +758dac27c246c51b019562bab7e266d2da6a6e01 \ 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 deleted file mode 100644 index 93ef1be7bec70..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d246a3a2c44cb682af0d9205d73938af2a080c2d \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..b4806746301ef --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-html-module-2.9.2.jar.sha1 @@ -0,0 +1 @@ +47f6a4c46b92616d14e82cd7ad4d05cb43077b83 \ 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 deleted file mode 100644 index 0cd872f218d04..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb4150db6d63709abc8fc8989838a5b404992a1b \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..da1ae42bac652 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.9.2.jar.sha1 @@ -0,0 +1 @@ +235a20823c02c699ce3d57f3d6b9550db05d91a9 \ 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 deleted file mode 100644 index f2b4dbf872e59..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3b723ba5e7aee3a3c10cb454e8910a85c09eb010 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..7ceed9e1643b8 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.9.2.jar.sha1 @@ -0,0 +1 @@ +7688a4220d07c32b505230479f957cd495c0bef2 \ 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 deleted file mode 100644 index 4eb43d64b8404..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -04f05429ef7948aadd9662e9ef3088118b3dfd57 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..e780c1b92d525 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.9.2.jar.sha1 @@ -0,0 +1 @@ +4d0f0e3f6eff184040402094f4fabbb3c5c7d09f \ 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 deleted file mode 100644 index 2774266c0ca9b..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -105b75bfc302f6a3dbf3e5b328e48fa53dcf4f8a \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..6e56fcffc5f88 --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-text-module-2.9.2.jar.sha1 @@ -0,0 +1 @@ +b3a93e538ba6cb4066aba96d629febf181ec9f92 \ 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 deleted file mode 100644 index 4ef62fda030c0..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa2eae90cfc929703413026457f5f6d15d997796 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..27062077b92bf --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.9.2.jar.sha1 @@ -0,0 +1 @@ +ff707716c0c4748ffeb21996aefa8d269b3eab5b \ 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 deleted file mode 100644 index a215be780da9e..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f0ab0cd63aa1e72effff8071e1cbb5a3698e1c30 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..396e2655b14db --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.9.2.jar.sha1 @@ -0,0 +1 @@ +69104107ff85194df5acf682178128771863e442 \ 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 deleted file mode 100644 index 2b19b56d4582b..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2c06ac859bc325a8468a98cb5714b3c4471427af \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..bda62033e4e8c --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.9.2.jar.sha1 @@ -0,0 +1 @@ +2fcea85a56f93a5c0cb81f3d6dd8673f3d81c598 \ 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 deleted file mode 100644 index ac18544574c74..0000000000000 --- a/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ecb2da95ee371139fbab64dbc784ca6e77e2a3c \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.2.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.2.jar.sha1 new file mode 100644 index 0000000000000..bb76974b6344e --- /dev/null +++ b/plugins/ingest-attachment/licenses/tika-parsers-standard-package-2.9.2.jar.sha1 @@ -0,0 +1 @@ +c8408deb51fa617ef4e912b4d161712e695d3a29 \ No newline at end of file diff --git a/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java b/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java index d771b23aea123..7f4a9b8ca0ac7 100644 --- a/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java +++ b/plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java @@ -65,11 +65,6 @@ public void testFiles() throws Exception { try (DirectoryStream stream = Files.newDirectoryStream(tmp)) { for (Path doc : stream) { - // Testing change with skipping - will remove in final code - if (doc.toString().endsWith(".pages") || doc.toString().endsWith(".key")) { - logger.debug("skipping: {}", doc); - continue; - } logger.debug("parsing: {}", doc); assertParseable(doc); } From 9e3ce43c6b31b7d7758afab016c13d1aeb8c2fa2 Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 2 Apr 2024 16:15:06 -0700 Subject: [PATCH 16/17] commons-io 2.16.0 Signed-off-by: Sandesh Kumar --- CHANGELOG.md | 8 ++++---- distribution/tools/plugin-cli/build.gradle | 2 +- .../tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 | 1 - .../tools/plugin-cli/licenses/commons-io-2.16.0.jar.sha1 | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 create mode 100644 distribution/tools/plugin-cli/licenses/commons-io-2.16.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bbc1a116397d..94d764140c5ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,10 +57,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.bouncycastle:bcpkix-jdk15to18` to `org.bouncycastle:bcpkix-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317)) - Bump Jackson version from 2.16.1 to 2.16.2 ([#12611](https://github.com/opensearch-project/OpenSearch/pull/12611)) - Bump `aws-sdk-java` from 2.20.55 to 2.20.86 ([#12251](https://github.com/opensearch-project/OpenSearch/pull/12251)) -- Bump `org.apache.commons:commons-compress` from 1.24.0 to 1.26.1 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) -- Bump `org.apache.commons:commonscodec` from 1.15 to 1.16.1 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) -- Bump `org.apache.commons:commonslang` from 3.13.0 to 3.14.0 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) -- Bump Apache Tika from 2.6.0 to 2.9.2 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) @@ -123,6 +119,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `net.minidev:json-smart` from 2.5.0 to 2.5.1 ([#12893](https://github.com/opensearch-project/OpenSearch/pull/12893)) - Bump `netty` from 4.1.107.Final to 4.1.108.Final ([#12924](https://github.com/opensearch-project/OpenSearch/pull/12924)) - Bump `commons-io:commons-io` from 2.15.1 to 2.16.0 ([#12996](https://github.com/opensearch-project/OpenSearch/pull/12996), [#12998](https://github.com/opensearch-project/OpenSearch/pull/12998), [#12999](https://github.com/opensearch-project/OpenSearch/pull/12999)) +- Bump `org.apache.commons:commons-compress` from 1.24.0 to 1.26.1 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) +- Bump `org.apache.commons:commonscodec` from 1.15 to 1.16.1 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) +- Bump `org.apache.commons:commonslang` from 3.13.0 to 3.14.0 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) +- Bump Apache Tika from 2.6.0 to 2.9.2 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627)) ### Changed - [BWC and API enforcement] Enforcing the presence of API annotations at build time ([#12872](https://github.com/opensearch-project/OpenSearch/pull/12872)) diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 2c5c5b23dd944..8faa891b82c1b 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -44,7 +44,7 @@ dependencies { testRuntimeOnly("com.google.guava:guava:${versions.guava}") { transitive = false } - api "commons-io:commons-io:2.15.1" + api "commons-io:commons-io:2.16.0" implementation "org.apache.commons:commons-compress:${versions.commonscompress}" } diff --git a/distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 b/distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 deleted file mode 100644 index 47c5d13812a36..0000000000000 --- a/distribution/tools/plugin-cli/licenses/commons-io-2.15.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f11560da189ab563a5c8e351941415430e9304ea \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/commons-io-2.16.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/commons-io-2.16.0.jar.sha1 new file mode 100644 index 0000000000000..6a7b638719fa3 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/commons-io-2.16.0.jar.sha1 @@ -0,0 +1 @@ +27875a7935f1ddcc13267eb6fae1f719e0409572 \ No newline at end of file From 54b8ef9ff17a84d19f1ae939b2991eb49c6f9efd Mon Sep 17 00:00:00 2001 From: Sandesh Kumar Date: Tue, 2 Apr 2024 16:23:57 -0700 Subject: [PATCH 17/17] Refactor commons-io dependency mentions to avoid manual version setting/update Signed-off-by: Sandesh Kumar --- buildSrc/build.gradle | 2 +- buildSrc/version.properties | 1 + distribution/tools/plugin-cli/build.gradle | 2 +- plugins/discovery-azure-classic/build.gradle | 2 +- plugins/ingest-attachment/build.gradle | 2 +- plugins/repository-hdfs/build.gradle | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 4c9fab99fef21..c68cc0406d3a6 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -109,7 +109,7 @@ dependencies { api 'com.netflix.nebula:nebula-publishing-plugin:21.0.0' api 'com.netflix.nebula:gradle-info-plugin:12.1.6' api 'org.apache.rat:apache-rat:0.15' - api 'commons-io:commons-io:2.15.1' + api "commons-io:commons-io:${props.getProperty('commonsio')}" api "net.java.dev.jna:jna:5.14.0" api 'com.github.johnrengelman:shadow:8.1.1' api 'org.jdom:jdom2:2.0.6.1' diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 842d98682f62e..c60f42dc1bb89 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -43,6 +43,7 @@ commonslogging = 1.2 commonscodec = 1.16.1 commonslang = 3.14.0 commonscompress = 1.26.1 +commonsio = 2.16.0 # plugin dependencies aws = 2.20.86 reactivestreams = 1.0.4 diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 8faa891b82c1b..446dbaad8466e 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -44,7 +44,7 @@ dependencies { testRuntimeOnly("com.google.guava:guava:${versions.guava}") { transitive = false } - api "commons-io:commons-io:2.16.0" + api "commons-io:commons-io:${versions.commonsio}" implementation "org.apache.commons:commons-compress:${versions.commonscompress}" } diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle index 68bda0933daa7..7f34cec94499c 100644 --- a/plugins/discovery-azure-classic/build.gradle +++ b/plugins/discovery-azure-classic/build.gradle @@ -53,7 +53,7 @@ dependencies { api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" api "commons-codec:commons-codec:${versions.commonscodec}" api "commons-lang:commons-lang:2.6" - api "commons-io:commons-io:2.16.0" + api "commons-io:commons-io:${versions.commonsio}" api 'javax.mail:mail:1.4.7' api 'javax.inject:javax.inject:1' api "com.sun.jersey:jersey-client:${versions.jersey}" diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index 262dc9e0e8335..4749aa911886d 100644 --- a/plugins/ingest-attachment/build.gradle +++ b/plugins/ingest-attachment/build.gradle @@ -67,7 +67,7 @@ dependencies { runtimeOnly "com.google.guava:guava:${versions.guava}" // Other dependencies api 'org.tukaani:xz:1.9' - api 'commons-io:commons-io:2.16.0' + api "commons-io:commons-io:${versions.commonsio}" api "org.slf4j:slf4j-api:${versions.slf4j}" // character set detection diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 6faf0383d3ba2..2c51bb4cbea53 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -75,7 +75,7 @@ dependencies { api 'commons-collections:commons-collections:3.2.2' api "org.apache.commons:commons-compress:${versions.commonscompress}" api 'org.apache.commons:commons-configuration2:2.10.1' - api 'commons-io:commons-io:2.16.0' + api "commons-io:commons-io:${versions.commonsio}" api 'org.apache.commons:commons-lang3:3.14.0' implementation 'com.google.re2j:re2j:1.7' api 'javax.servlet:servlet-api:2.5'