[Backport 2.2] Upgrade dependencies (#4166)

* Upgrade dependencies (#4047) * Upgrading dependencies for hadoop and aws-java-sdk Signed-off-by: Vacha Shah <[email protected]> * Fixing precommit Signed-off-by: Vacha Shah <[email protected]> * Upgrading transitive dependencies Signed-off-by: Vacha Shah <[email protected]> * Excluding transitive dependencies Signed-off-by: Vacha Shah <[email protected]> (cherry picked from commit 88f5537) (cherry picked from commit 7d92565) * Removing seg-rep IT class from the scope of this backport The original change included a javadoc update to the IT class, but the test class was never backported from #3743 to 2.x. Since the scope of this change is to backport dependency upgrades only, this class has been removed. Signed-off-by: Kartik Ganesh <[email protected]> (cherry picked from commit d6ead92) Co-authored-by: Vacha Shah <[email protected]>
opensearch-project · Aug 8, 2022 · b1017fa · b1017fa
1 parent 4035bf7
commit b1017fa
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 17 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -112,6 +112,8 @@ dependencies {
   api 'commons-io:commons-io:2.7'
   api "net.java.dev.jna:jna:5.11.0"
   api 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
+  api 'org.jdom:jdom2:2.0.6.1'
+  api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10'
   api 'de.thetaphi:forbiddenapis:3.3'
   api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.12'
   api 'org.apache.maven:maven-model:3.6.2'

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -32,7 +32,7 @@ commonslogging    = 1.2
 commonscodec      = 1.13
 
 # plugin dependencies
-aws               = 1.12.247
+aws               = 1.12.270
 
 # when updating this version, you need to ensure compatibility with:
 #  - plugins/ingest-attachment (transitive dependency, check the upstream POM)

diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.270.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.270.jar.sha1
@@ -0,0 +1 @@
+8f0cc2cc1b41c51e2117f5b1ce6530febf99d4ba
diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.270.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.270.jar.sha1
@@ -0,0 +1 @@
+6d0ce44b33006e163c25f394f869e6b3a51aefc5
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -48,7 +48,7 @@ opensearchplugin {
 }
 
 versions << [
-  'hadoop3': '3.3.1'
+  'hadoop3': '3.3.3'
 ]
 
 testFixtures.useFixture ":test:fixtures:krb5kdc-fixture", "hdfs"
@@ -60,7 +60,9 @@ configurations {
 dependencies {
   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:${versions.hadoop3}") {
+    exclude module: 'jetty-server'
+  }
   api 'org.apache.htrace:htrace-core4:4.2.0-incubating'
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
   api 'org.apache.avro:avro:1.10.2'
@@ -438,10 +440,6 @@ thirdPartyAudit {
     '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',

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
diff --git a/plugins/repository-hdfs/licenses/hadoop-client-api-3.3.3.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-api-3.3.3.jar.sha1
@@ -0,0 +1 @@
+d0593aed2d4df9bcee507550913d29d589ebd84a
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
diff --git a/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.3.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.3.jar.sha1
@@ -0,0 +1 @@
+52619ecfb0225d7ae67b15264521064824ac57ca
diff --git a/plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.3.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.3.jar.sha1
@@ -0,0 +1 @@
+d4d199760c11d47f90e12fe3882e2b24c77e4eb5
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-core-1.12.270.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-core-1.12.270.jar.sha1
@@ -0,0 +1 @@
+8f0cc2cc1b41c51e2117f5b1ce6530febf99d4ba
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.270.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.270.jar.sha1
@@ -0,0 +1 @@
+2901cdd72a7f0d940b2bd4e1bcdb606d5d33736f
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.270.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.270.jar.sha1
@@ -0,0 +1 @@
+aeffa3e8d9471377adf1108e21dab92f4f13edb3
diff --git a/plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1
diff --git a/plugins/repository-s3/licenses/jmespath-java-1.12.270.jar.sha1 b/plugins/repository-s3/licenses/jmespath-java-1.12.270.jar.sha1
@@ -0,0 +1 @@
+5bd3e1976e3b3b94c30e4868af9a5bfc4221e24a
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
@@ -33,7 +33,9 @@ apply plugin: 'opensearch.java'
 group = 'hdfs'
 
 dependencies {
-  api "org.apache.hadoop:hadoop-minicluster:3.3.2"
+  api("org.apache.hadoop:hadoop-minicluster:3.3.3") {
+    exclude module: 'websocket-client'
+  }
   api "org.apache.commons:commons-compress:1.21"
   api "commons-codec:commons-codec:${versions.commonscodec}"
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
@@ -44,4 +46,5 @@ dependencies {
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
   api 'net.minidev:json-smart:2.4.8'
   api "org.mockito:mockito-core:${versions.mockito}"
+  api "com.google.protobuf:protobuf-java:3.21.2"
 }