Fix snappy dependency for HDFS plugin

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
kotwanikunal · Sep 13, 2023 · 6da8301 · 6da8301
1 parent 6462641
commit 6da8301
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bump `org.xerial.snappy:snappy-java` from 1.1.8.2 to 1.1.10.3 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252))
 - Bump `com.squareup.okhttp3:okhttp` from 4.9.3 to 4.11.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252))
 - Bump `com.squareup.okio:okio` from 2.8.0 to 3.5.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252))
-- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 ([#8585](https://github.com/opensearch-project/OpenSearch/pull/8585))
 
 ### Changed
 ### Deprecated

diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle
@@ -38,7 +38,7 @@ dependencies {
   api "org.bouncycastle:bcpg-fips:1.0.5.1"
   api "org.bouncycastle:bc-fips:1.0.2.3"
   testImplementation project(":test:framework")
-  testImplementation 'com.google.jimfs:jimfs:1.3.0'
+  testImplementation 'com.google.jimfs:jimfs:1.2'
   testRuntimeOnly("com.google.guava:guava:${versions.guava}") {
     transitive = false
   }

diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -84,6 +84,7 @@ dependencies {
   api "io.netty:netty-all:${versions.netty}"
   implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
   implementation 'org.codehaus.woodstox:stax2-api:4.2.1'
+  runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.3"
 
   hdfsFixture project(':test:fixtures:hdfs-fixture')
   // Set the keytab files in the classpath so that we can access them from test code without the security manager

diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle
@@ -33,14 +33,14 @@
  * integration, change default filesystem impl, mess with arbitrary
  * threads, etc.
  */
- 
+
 import org.opensearch.gradle.info.BuildParams
 
 apply plugin: 'opensearch.testclusters'
 apply plugin: 'opensearch.standalone-test'
 
 dependencies {
-  testImplementation 'com.google.jimfs:jimfs:1.3.0'
+  testImplementation 'com.google.jimfs:jimfs:1.2'
 }
 
 // TODO: give each evil test its own fresh JVM for more isolation.
@@ -62,6 +62,7 @@ thirdPartyAudit {
     'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
     'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
     'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
+    'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
     'com.google.common.hash.Striped64',
     'com.google.common.hash.Striped64$1',
     'com.google.common.hash.Striped64$Cell',