Merge branch 'main' into update.otel

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Sep 11, 2023 · 0d5d23e · 0d5d23e
2 parents c03687c + 05544ae
commit 0d5d23e
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -80,6 +80,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `peter-evans/create-or-update-comment` from 2 to 3 ([#9575](https://github.com/opensearch-project/OpenSearch/pull/9575))
 - Bump `actions/checkout` from 2 to 4 ([#9968](https://github.com/opensearch-project/OpenSearch/pull/9968))
 - Bump OpenTelemetry from 1.26.0 to 1.30.1 ([#9950](https://github.com/opensearch-project/OpenSearch/pull/9950))
+- Bump `org.apache.commons:commons-compress` from 1.23.0 to 1.24.0 ([#9973](https://github.com/opensearch-project/OpenSearch/pull/9973))
 
 ### Changed
 - Add instrumentation in rest and network layer. ([#9415](https://github.com/opensearch-project/OpenSearch/pull/9415))

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -40,6 +40,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
@@ -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
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
@@ -0,0 +1 @@
+b4b1b5a3d9573b2970fddab236102c0a4d27d35e
diff --git 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.23.0'
+  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.23.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-compress-1.23.0.jar.sha1
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
@@ -0,0 +1 @@
+b4b1b5a3d9573b2970fddab236102c0a4d27d35e
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -73,7 +73,7 @@ dependencies {
   api 'commons-cli:commons-cli:1.5.0'
   api "commons-codec:commons-codec:${versions.commonscodec}"
   api 'commons-collections:commons-collections:3.2.2'
-  api 'org.apache.commons:commons-compress:1.23.0'
+  api "org.apache.commons:commons-compress:${versions.commonscompress}"
   api 'org.apache.commons:commons-configuration2:2.9.0'
   api 'commons-io:commons-io:2.13.0'
   api 'org.apache.commons:commons-lang3:3.13.0'

diff --git a/plugins/repository-hdfs/licenses/commons-compress-1.23.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-compress-1.23.0.jar.sha1
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
@@ -0,0 +1 @@
+b4b1b5a3d9573b2970fddab236102c0a4d27d35e