From e4ae8fe950dfb28ab48ca4e93e5d333a0e53ab63 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Tue, 12 Sep 2023 12:41:25 -0400 Subject: [PATCH] Bump org.apache.commons:commons-compress from 1.23.0 to 1.24.0 (#9973) (#9978) (cherry picked from commit 05544ae2b9d8a7d4cd6dc0241dc31126a154fa4d) Signed-off-by: Andriy Redko --- CHANGELOG.md | 1 + buildSrc/version.properties | 1 + distribution/tools/plugin-cli/build.gradle | 2 +- .../tools/plugin-cli/licenses/commons-compress-1.23.0.jar.sha1 | 1 - .../tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 | 1 + plugins/ingest-attachment/build.gradle | 2 +- .../ingest-attachment/licenses/commons-compress-1.22.jar.sha1 | 1 - .../ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 | 1 + plugins/repository-hdfs/build.gradle | 2 +- plugins/repository-hdfs/licenses/commons-compress-1.21.jar.sha1 | 1 - .../repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 | 1 + 11 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 distribution/tools/plugin-cli/licenses/commons-compress-1.23.0.jar.sha1 create mode 100644 distribution/tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/commons-compress-1.22.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/commons-compress-1.21.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index a61a4b148d533..a9d55c8cc412c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added ### Dependencies +- Bump `org.apache.commons:commons-compress` from 1.23.0 to 1.24.0 ([#9973](https://github.com/opensearch-project/OpenSearch/pull/9973)) - Bump JNA version from 5.5 to 5.13 ([#9963](https://github.com/opensearch-project/OpenSearch/pull/9963)) ### Changed diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 729ce5bfee07c..0820ace7ac838 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -36,6 +36,7 @@ httpasyncclient = 4.1.5 commonslogging = 1.2 commonscodec = 1.15 commonslang = 3.13.0 +commonscompress = 1.24.0 # plugin dependencies aws = 2.20.55 reactivestreams = 1.0.4 diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 5103999428814..2db3fef55d02e 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -45,7 +45,7 @@ dependencies { transitive = false } - implementation 'org.apache.commons:commons-compress:1.23.0' + implementation "org.apache.commons:commons-compress:${versions.commonscompress}" } tasks.named("dependencyLicenses").configure { diff --git a/distribution/tools/plugin-cli/licenses/commons-compress-1.23.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/commons-compress-1.23.0.jar.sha1 deleted file mode 100644 index 48dba88409c17..0000000000000 --- a/distribution/tools/plugin-cli/licenses/commons-compress-1.23.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4af2060ea9b0c8b74f1854c6cafe4d43cfc161fc \ No newline at end of file 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 new file mode 100644 index 0000000000000..23999d1bfbde4 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/commons-compress-1.24.0.jar.sha1 @@ -0,0 +1 @@ +b4b1b5a3d9573b2970fddab236102c0a4d27d35e \ No newline at end of file diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index 5934475e1e034..f54c80e9f76c1 100644 --- a/plugins/ingest-attachment/build.gradle +++ b/plugins/ingest-attachment/build.gradle @@ -84,7 +84,7 @@ dependencies { // MS Office api "org.apache.poi:poi-scratchpad:${versions.poi}" // Apple iWork - api 'org.apache.commons:commons-compress:1.22' + api "org.apache.commons:commons-compress:${versions.commonscompress}" // Outlook documents api "org.apache.james:apache-mime4j-core:${versions.mime4j}" api "org.apache.james:apache-mime4j-dom:${versions.mime4j}" diff --git a/plugins/ingest-attachment/licenses/commons-compress-1.22.jar.sha1 b/plugins/ingest-attachment/licenses/commons-compress-1.22.jar.sha1 deleted file mode 100644 index 9ab7216c8050a..0000000000000 --- a/plugins/ingest-attachment/licenses/commons-compress-1.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -691a8b4e6cf4248c3bc72c8b719337d5cb7359fa \ 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 new file mode 100644 index 0000000000000..23999d1bfbde4 --- /dev/null +++ b/plugins/ingest-attachment/licenses/commons-compress-1.24.0.jar.sha1 @@ -0,0 +1 @@ +b4b1b5a3d9573b2970fddab236102c0a4d27d35e \ No newline at end of file diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index afd8f429c9d84..a5c5015a89a62 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -73,7 +73,7 @@ dependencies { api 'commons-cli:commons-cli:1.2' api "commons-codec:commons-codec:${versions.commonscodec}" api 'commons-collections:commons-collections:3.2.2' - api 'org.apache.commons:commons-compress:1.21' + api "org.apache.commons:commons-compress:${versions.commonscompress}" api 'org.apache.commons:commons-configuration2:2.8.0' api 'commons-io:commons-io:2.12.0' api 'org.apache.commons:commons-lang3:3.13.0' diff --git a/plugins/repository-hdfs/licenses/commons-compress-1.21.jar.sha1 b/plugins/repository-hdfs/licenses/commons-compress-1.21.jar.sha1 deleted file mode 100644 index 81ac609a1aa26..0000000000000 --- a/plugins/repository-hdfs/licenses/commons-compress-1.21.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4ec95b60d4e86b5c95a0e919cb172a0af98011ef \ 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 new file mode 100644 index 0000000000000..23999d1bfbde4 --- /dev/null +++ b/plugins/repository-hdfs/licenses/commons-compress-1.24.0.jar.sha1 @@ -0,0 +1 @@ +b4b1b5a3d9573b2970fddab236102c0a4d27d35e \ No newline at end of file