Update protobuf-java to 3.19.3 (#1945)

* Update protobuf-java to 3.19.3 Signed-off-by: Tianli Feng <ftl94@live.com> * Exclude some API usage violations in the package com.google.protobuf for thirdPartyAudit task to pass Signed-off-by: Tianli Feng <ftl94@live.com>
opensearch-project · Jan 20, 2022 · 8b8d041 · 8b8d041
1 parent e0216da
commit 8b8d041
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -61,8 +61,8 @@ dependencies {
   api 'com.google.api:api-common:1.8.1'
   api 'com.google.api:gax:1.54.0'
   api 'org.threeten:threetenbp:1.4.4'
-  api 'com.google.protobuf:protobuf-java-util:3.11.3'
-  api 'com.google.protobuf:protobuf-java:3.11.3'
+  api 'com.google.protobuf:protobuf-java-util:3.19.3'
+  api 'com.google.protobuf:protobuf-java:3.19.3'
   api 'com.google.code.gson:gson:2.8.9'
   api 'com.google.api.grpc:proto-google-common-protos:1.16.0'
   api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'

diff --git a/plugins/repository-gcs/licenses/protobuf-java-3.11.3.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.11.3.jar.sha1
diff --git a/plugins/repository-gcs/licenses/protobuf-java-3.19.3.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.19.3.jar.sha1
@@ -0,0 +1 @@
+4b57f1b1b9e281231c3fcfc039ce3021e29ff570
diff --git a/plugins/repository-gcs/licenses/protobuf-java-util-3.11.3.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-util-3.11.3.jar.sha1
diff --git a/plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1
@@ -0,0 +1 @@
+3e6812cbbb7e6faffa7b56438740dec510e1fc1a
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -67,7 +67,7 @@ dependencies {
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
   api 'com.google.code.gson:gson:2.8.9'
   runtimeOnly 'com.google.guava:guava:30.1.1-jre'
-  api 'com.google.protobuf:protobuf-java:2.5.0'
+  api 'com.google.protobuf:protobuf-java:3.19.3'
   api 'commons-logging:commons-logging:1.1.3'
   api 'commons-cli:commons-cli:1.2'
   api "commons-codec:commons-codec:${versions.commonscodec}"
@@ -113,6 +113,19 @@ tasks.named("dependencyLicenses").configure {
   mapping from: /hadoop-.*/, to: 'hadoop'
 }
 
+thirdPartyAudit {
+  ignoreViolations(
+    // uses internal java api: sun.misc.Unsafe
+    'com.google.protobuf.MessageSchema',
+    'com.google.protobuf.UnsafeUtil',
+    'com.google.protobuf.UnsafeUtil$1',
+    'com.google.protobuf.UnsafeUtil$Android32MemoryAccessor',
+    'com.google.protobuf.UnsafeUtil$Android64MemoryAccessor',
+    'com.google.protobuf.UnsafeUtil$JvmMemoryAccessor',
+    'com.google.protobuf.UnsafeUtil$MemoryAccessor'
+  )
+}
+
 tasks.named("integTest").configure {
   it.dependsOn(project.tasks.named("bundlePlugin"))
 }
@@ -235,7 +248,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
           )
         }
       }
-      
+
       if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
         jvmArgs += ["--add-opens", "java.security.jgss/sun.security.krb5=ALL-UNNAMED"]
       }

diff --git a/plugins/repository-hdfs/licenses/protobuf-java-2.5.0.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-2.5.0.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.19.3.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.19.3.jar.sha1
@@ -0,0 +1 @@
+4b57f1b1b9e281231c3fcfc039ce3021e29ff570