From d8feb4de244439f770106f339ed1a569e55da1fd Mon Sep 17 00:00:00 2001 From: ThomasCJY Date: Wed, 20 Apr 2022 03:35:59 -0700 Subject: [PATCH] [Step 2] Update non-third party change for jackson2 Follow up for https://github.com/bazelbuild/bazel/pull/15215 and Step two for https://github.com/bazelbuild/bazel/pull/15176 Closes #15295. PiperOrigin-RevId: 443050332 --- .../devtools/build/lib/remote/GrpcCacheClientTestBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTestBase.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTestBase.java index 0df9cd76e2fe3e..97a564b6ec2db0 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTestBase.java +++ b/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTestBase.java @@ -19,7 +19,7 @@ import build.bazel.remote.execution.v2.Digest; import build.bazel.remote.execution.v2.RequestMetadata; 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.common.collect.ImmutableList; import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; @@ -135,7 +135,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()) {