Upgrading commons-codec in hdfs-fixture and cleaning up dependencies …

…in repository-hdfs (#1603) Signed-off-by: Vacha <[email protected]>
opensearch-project · Nov 23, 2021 · fd87f3a · fd87f3a
1 parent 12a2294
commit fd87f3a
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 14 deletions.
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -58,15 +58,10 @@ configurations {
 }
 
 dependencies {
-  api "org.apache.hadoop:hadoop-client:${versions.hadoop3}"
-  api "org.apache.hadoop:hadoop-common:${versions.hadoop3}"
-  api "org.apache.hadoop:hadoop-annotations:${versions.hadoop3}"
-  api "org.apache.hadoop:hadoop-auth:${versions.hadoop3}"
+  api "org.apache.hadoop:hadoop-client-api:${versions.hadoop3}"
+  runtimeOnly "org.apache.hadoop:hadoop-client-runtime:${versions.hadoop3}"
   api "org.apache.hadoop:hadoop-hdfs:${versions.hadoop3}"
-  api "org.apache.hadoop:hadoop-hdfs-client:${versions.hadoop3}"
   api 'org.apache.htrace:htrace-core4:4.1.0-incubating'
-  api "org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1"
-  api "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1"
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
   api 'org.apache.avro:avro:1.10.2'
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
@@ -382,6 +377,52 @@ thirdPartyAudit {
     'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$JvmMemoryAccessor',
     'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$MemoryAccessor',
 
+    'org.apache.hadoop.shaded.com.google.common.cache.Striped64',
+    'org.apache.hadoop.shaded.com.google.common.cache.Striped64$1',
+    'org.apache.hadoop.shaded.com.google.common.cache.Striped64$Cell',
+    'org.apache.hadoop.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
+    'org.apache.hadoop.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
+    'org.apache.hadoop.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
+    'org.apache.hadoop.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
+    'org.apache.hadoop.shaded.com.google.common.hash.Striped64',
+    'org.apache.hadoop.shaded.com.google.common.hash.Striped64$1',
+    'org.apache.hadoop.shaded.com.google.common.hash.Striped64$Cell',
+    'org.apache.hadoop.shaded.com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator',
+    'org.apache.hadoop.shaded.com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1',
+    'org.apache.hadoop.shaded.com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
+    'org.apache.hadoop.shaded.com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeBooleanField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeByteField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeCachedField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeCharField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeCustomEncodedField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeDoubleField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeFloatField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeIntField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeLongField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeObjectField',
+    'org.apache.hadoop.shaded.org.apache.avro.reflect.FieldAccessUnsafe$UnsafeShortField',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.cache.Striped64',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.cache.Striped64$1',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.cache.Striped64$Cell',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.hash.Striped64',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.hash.Striped64$1',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.hash.Striped64$Cell',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
+    'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1',
+    'org.apache.hadoop.shaded.org.xbill.DNS.spi.DNSJavaNameServiceDescriptor',
+    'org.apache.hadoop.shaded.org.xerial.snappy.pure.PureJavaSnappy',
+    'org.apache.hadoop.shaded.org.xerial.snappy.pure.SnappyRawCompressor',
+    'org.apache.hadoop.shaded.org.xerial.snappy.pure.SnappyRawDecompressor',
+    'org.apache.hadoop.shaded.org.xerial.snappy.pure.UnsafeUtil',
+
     'org.apache.avro.reflect.FieldAccessUnsafe',
     'org.apache.avro.reflect.FieldAccessUnsafe$UnsafeBooleanField',
     'org.apache.avro.reflect.FieldAccessUnsafe$UnsafeByteField',

diff --git a/plugins/repository-hdfs/licenses/hadoop-annotations-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-annotations-3.3.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/hadoop-auth-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-auth-3.3.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/hadoop-client-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-3.3.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/hadoop-client-api-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-api-3.3.1.jar.sha1
@@ -0,0 +1 @@
+4b9c9cdd9967495838fb521001699c4c9dddf183
diff --git a/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.1.jar.sha1
@@ -0,0 +1 @@
+f3a55d882328ee87a1054f99d62ba987fa9029a4
diff --git a/plugins/repository-hdfs/licenses/hadoop-common-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-common-3.3.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/hadoop-hdfs-client-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-hdfs-client-3.3.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/hadoop-shaded-guava-1.1.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-shaded-guava-1.1.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/hadoop-shaded-protobuf_3_7-1.1.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-shaded-protobuf_3_7-1.1.1.jar.sha1
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
@@ -35,6 +35,7 @@ group = 'hdfs'
 dependencies {
   api "org.apache.hadoop:hadoop-minicluster:3.3.1"
   api "org.apache.commons:commons-compress:1.21"
+  api "commons-codec:commons-codec:${versions.commonscodec}"
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
   api "io.netty:netty-all:${versions.netty}"
   api 'com.google.code.gson:gson:2.8.9'