[5.2] Upgrade Google Auth Version (bazelbuild#15383)

* [Step 1] Upgrade Google Auth Version third party only changes gson add back jackson Partial commit for third_party/*, see bazelbuild#15215. Closes bazelbuild#15215 Signed-off-by: Yun Peng <[email protected]> * [Step 2] Update non-third party change for jackson2 Follow up for bazelbuild#15215 and Step two for bazelbuild#15176 Closes bazelbuild#15295. PiperOrigin-RevId: 443050332 * clean up Partial commit for third_party/*, see bazelbuild#15301. Closes: bazelbuild#15301 Signed-off-by: Yun Peng <[email protected]> Co-authored-by: Thomas Chen <[email protected]> Co-authored-by: ThomasCJY <[email protected]>
uber-common · May 9, 2022 · f0213bb · f0213bb
1 parent b30b3ed
commit f0213bb
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 15 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTest.java
@@ -39,7 +39,7 @@
 import build.bazel.remote.execution.v2.Tree;
 import build.bazel.remote.execution.v2.UpdateActionResultRequest;
 import com.google.api.client.json.GenericJson;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.bytestream.ByteStreamGrpc.ByteStreamImplBase;
 import com.google.bytestream.ByteStreamProto.QueryWriteStatusRequest;
 import com.google.bytestream.ByteStreamProto.QueryWriteStatusResponse;
@@ -213,7 +213,7 @@ protected GrpcCacheClient newClient(
     json.put("client_secret", "foo");
     json.put("refresh_token", "bar");
     Scratch scratch = new Scratch();
-    scratch.file(authTlsOptions.googleCredentials, new JacksonFactory().toString(json));
+    scratch.file(authTlsOptions.googleCredentials, new GsonFactory().toString(json));
 
     CallCredentialsProvider callCredentialsProvider;
     try (InputStream in = scratch.resolve(authTlsOptions.googleCredentials).getInputStream()) {

diff --git a/third_party/BUILD b/third_party/BUILD
@@ -169,12 +169,12 @@ distrib_java_import(
     enable_distributions = ["debian"],
     jars = [
         "api_client/google-api-client-1.22.0.jar",
-        "api_client/google-api-client-jackson2-1.22.0.jar",
+        "api_client/google-api-client-gson-1.22.0.jar",
         "api_client/google-http-client-1.22.0-SNAPSHOT.jar",
-        "api_client/google-http-client-jackson2-1.22.0.jar",
+        "api_client/google-http-client-gson-1.22.0.jar",
     ],
     runtime_deps = [
-        ":jackson2",
+        ":gson",
     ],
 )
 
@@ -217,8 +217,8 @@ distrib_java_import(
     name = "auth",
     enable_distributions = ["debian"],
     jars = [
-        "auth/google-auth-library-oauth2-http-0.17.1.jar",
-        "auth/google-auth-library-credentials-0.17.1.jar",
+        "auth/google-auth-library-oauth2-http-1.6.0.jar",
+        "auth/google-auth-library-credentials-1.6.0.jar",
     ],
     runtime_deps = [
         ":api_client",
@@ -410,14 +410,6 @@ java_import(
     ],
 )
 
-distrib_java_import(
-    name = "jackson2",
-    enable_distributions = ["debian"],
-    jars = [
-        "jackson2/jackson-core-2.8.6.jar",
-    ],
-)
-
 distrib_java_import(
     name = "jcip_annotations",
     enable_distributions = ["debian"],

diff --git a/third_party/api_client/google-api-client-gson-1.22.0.jar b/third_party/api_client/google-api-client-gson-1.22.0.jar
diff --git a/third_party/api_client/google-api-client-jackson2-1.22.0.jar b/third_party/api_client/google-api-client-jackson2-1.22.0.jar
diff --git a/third_party/api_client/google-http-client-gson-1.22.0.jar b/third_party/api_client/google-http-client-gson-1.22.0.jar
diff --git a/third_party/api_client/google-http-client-jackson2-1.22.0.jar b/third_party/api_client/google-http-client-jackson2-1.22.0.jar
diff --git a/third_party/auth/google-auth-library-credentials-0.17.1.jar b/third_party/auth/google-auth-library-credentials-0.17.1.jar
diff --git a/third_party/auth/google-auth-library-credentials-1.6.0.jar b/third_party/auth/google-auth-library-credentials-1.6.0.jar
diff --git a/third_party/auth/google-auth-library-oauth2-http-0.17.1.jar b/third_party/auth/google-auth-library-oauth2-http-0.17.1.jar
diff --git a/third_party/auth/google-auth-library-oauth2-http-1.6.0.jar b/third_party/auth/google-auth-library-oauth2-http-1.6.0.jar
diff --git a/third_party/jackson2/jackson-core-2.8.6.jar b/third_party/jackson2/jackson-core-2.8.6.jar