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 index 5975f5eecd67c2..28d4997c39f523 100644 --- 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 index 93e7c848ae6e9f..eaf36b156eaa49 100644 --- 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 new file mode 100644 index 00000000000000..3598e91d3dedf6 Binary files /dev/null and b/third_party/api_client/google-api-client-gson-1.22.0.jar differ 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 deleted file mode 100644 index 1e33c9bf4de5f1..00000000000000 Binary files a/third_party/api_client/google-api-client-jackson2-1.22.0.jar and /dev/null differ 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 new file mode 100644 index 00000000000000..e97065abf20f30 Binary files /dev/null and b/third_party/api_client/google-http-client-gson-1.22.0.jar differ 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 deleted file mode 100644 index 64f0c1594ee54f..00000000000000 Binary files a/third_party/api_client/google-http-client-jackson2-1.22.0.jar and /dev/null differ 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 deleted file mode 100644 index 3765c6f519f44d..00000000000000 Binary files a/third_party/auth/google-auth-library-credentials-0.17.1.jar and /dev/null differ 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 new file mode 100644 index 00000000000000..fedb33a282a553 Binary files /dev/null and b/third_party/auth/google-auth-library-credentials-1.6.0.jar differ 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 deleted file mode 100644 index d57c1562e0e0de..00000000000000 Binary files a/third_party/auth/google-auth-library-oauth2-http-0.17.1.jar and /dev/null differ 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 new file mode 100644 index 00000000000000..14b899f5d3bc18 Binary files /dev/null and b/third_party/auth/google-auth-library-oauth2-http-1.6.0.jar differ diff --git a/third_party/jackson2/jackson-core-2.8.6.jar b/third_party/jackson2/jackson-core-2.8.6.jar deleted file mode 100644 index 2b10bf3030f994..00000000000000 Binary files a/third_party/jackson2/jackson-core-2.8.6.jar and /dev/null differ