From 8b8d04173c312e32ebb9e015ba27eb286cc2f657 Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Thu, 20 Jan 2022 11:05:28 -0800 Subject: [PATCH] Update protobuf-java to 3.19.3 (#1945) * Update protobuf-java to 3.19.3 Signed-off-by: Tianli Feng * Exclude some API usage violations in the package com.google.protobuf for thirdPartyAudit task to pass Signed-off-by: Tianli Feng --- plugins/repository-gcs/build.gradle | 4 ++-- .../licenses/protobuf-java-3.11.3.jar.sha1 | 1 - .../licenses/protobuf-java-3.19.3.jar.sha1 | 1 + .../licenses/protobuf-java-util-3.11.3.jar.sha1 | 1 - .../licenses/protobuf-java-util-3.19.3.jar.sha1 | 1 + plugins/repository-hdfs/build.gradle | 17 +++++++++++++++-- .../licenses/protobuf-java-2.5.0.jar.sha1 | 1 - .../licenses/protobuf-java-3.19.3.jar.sha1 | 1 + 8 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/protobuf-java-3.11.3.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/protobuf-java-3.19.3.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/protobuf-java-util-3.11.3.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/protobuf-java-2.5.0.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/protobuf-java-3.19.3.jar.sha1 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 5ab7d79d6f0c5..adb97855887f0 100644 --- 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 deleted file mode 100644 index 371f423c3751e..0000000000000 --- a/plugins/repository-gcs/licenses/protobuf-java-3.11.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df12be70b968e32442821a2cfdc3cede5a42dec5 \ No newline at end of file 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 new file mode 100644 index 0000000000000..655ecd1f1c1c9 --- /dev/null +++ b/plugins/repository-gcs/licenses/protobuf-java-3.19.3.jar.sha1 @@ -0,0 +1 @@ +4b57f1b1b9e281231c3fcfc039ce3021e29ff570 \ No newline at end of file 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 deleted file mode 100644 index 8f8d3cf3c9e49..0000000000000 --- a/plugins/repository-gcs/licenses/protobuf-java-util-3.11.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fd4ba2dfeb1b010eb20ca27e65fbfb74fbbdcdb9 \ No newline at end of file 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 new file mode 100644 index 0000000000000..9ba36d444c541 --- /dev/null +++ b/plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 @@ -0,0 +1 @@ +3e6812cbbb7e6faffa7b56438740dec510e1fc1a \ No newline at end of file diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 9688835d0853f..3cfe70b6d89a1 100644 --- 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 deleted file mode 100644 index 71f918819e2b6..0000000000000 --- a/plugins/repository-hdfs/licenses/protobuf-java-2.5.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a10732c76bfacdbd633a7eb0f7968b1059a65dfa \ No newline at end of file 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 new file mode 100644 index 0000000000000..655ecd1f1c1c9 --- /dev/null +++ b/plugins/repository-hdfs/licenses/protobuf-java-3.19.3.jar.sha1 @@ -0,0 +1 @@ +4b57f1b1b9e281231c3fcfc039ce3021e29ff570 \ No newline at end of file