Skip to content

Commit 545c4c3

Browse files
committed
Upgrade google-http-client and google-http-client-gson.
In bazelbuild#15176 we upgraded google-auth-library-oauth2-http to 1.6.0, but didn't upgrade its dependencies accordingly; Maven claims 1.41.1 is needed [1]. In turn, a new transitive dependency on opencensus-contrib-http-util 0.31.0 also becomes necessary [2]. [1] https://mvnrepository.com/artifact/com.google.auth/google-auth-library-oauth2-http/1.6.0 [2] https://mvnrepository.com/artifact/com.google.http-client/google-http-client/1.41.1
1 parent 1d4cecf commit 545c4c3

File tree

7 files changed

+4
-3
lines changed

7 files changed

+4
-3
lines changed

src/main/java/com/google/devtools/build/lib/remote/util/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public static String grpcAwareErrorMessage(IOException e) {
402402
// to the user
403403
return String.format("%s: %s", errStatus.getCode().name(), errStatus.getDescription());
404404
}
405-
return e.getMessage();
405+
return String.format("%s: %s", e.getMessage(), Throwables.getStackTraceAsString(e));
406406
}
407407

408408
public static String grpcAwareErrorMessage(Throwable error, boolean verboseFailures) {

third_party/BUILD

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ distrib_java_import(
167167
jars = [
168168
"api_client/google-api-client-1.22.0.jar",
169169
"api_client/google-api-client-gson-1.22.0.jar",
170-
"api_client/google-http-client-1.22.0-SNAPSHOT.jar",
171-
"api_client/google-http-client-gson-1.22.0.jar",
170+
"api_client/google-http-client-1.41.4.jar",
171+
"api_client/google-http-client-gson-1.41.4.jar",
172172
],
173173
runtime_deps = [
174174
":gson",
@@ -511,6 +511,7 @@ distrib_java_import(
511511
jars = [
512512
"opencensus/opencensus-api-0.24.0.jar",
513513
"opencensus/opencensus-contrib-grpc-metrics-0.24.0.jar",
514+
"opencensus/opencensus-contrib-http-util-0.31.0.jar",
514515
],
515516
)
516517

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)