From da60ee71e48e3031f63ee179b14ac43e68898cc1 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 29 Jun 2026 20:59:43 +0000 Subject: [PATCH] chore(deps): update google-http-client to v2.1.1 Update all references to com.google.http-client:google-http-client to v2.1.1. Fix a test in google-auth-library-java that was broken by a behavior change in GenericData.containsKey(). TAG=agy CONV=434bf939-537d-4929-a784-244f71a2b946 --- .../java-storage-expected-flattened-dependencies.txt | 10 +++++----- .../auth/oauth2/ServiceAccountCredentialsTest.java | 2 +- google-auth-library-java/pom.xml | 2 +- grpc-gcp-java/pom.xml | 2 +- .../google-cloud-bigquerystorage/pom.xml | 2 +- .../gapic-generator-java-pom-parent/pom.xml | 2 +- sdk-platform-java/gax-java/dependencies.properties | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.kokoro/java-storage-expected-flattened-dependencies.txt b/.kokoro/java-storage-expected-flattened-dependencies.txt index 3e63ad9f51af..b9b01325273b 100644 --- a/.kokoro/java-storage-expected-flattened-dependencies.txt +++ b/.kokoro/java-storage-expected-flattened-dependencies.txt @@ -33,11 +33,11 @@ com.google.errorprone:error_prone_annotations:jar:2.48.0:compile com.google.guava:failureaccess:jar:1.0.3:compile com.google.guava:guava:jar:33.5.0-jre:compile com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile -com.google.http-client:google-http-client-apache-v2:jar:2.1.0:compile -com.google.http-client:google-http-client-appengine:jar:2.1.0:compile -com.google.http-client:google-http-client-gson:jar:2.1.0:compile -com.google.http-client:google-http-client-jackson2:jar:2.1.0:compile -com.google.http-client:google-http-client:jar:2.1.0:compile +com.google.http-client:google-http-client-apache-v2:jar:2.1.1:compile +com.google.http-client:google-http-client-appengine:jar:2.1.1:compile +com.google.http-client:google-http-client-gson:jar:2.1.1:compile +com.google.http-client:google-http-client-jackson2:jar:2.1.1:compile +com.google.http-client:google-http-client:jar:2.1.1:compile com.google.j2objc:j2objc-annotations:jar:3.1:compile com.google.oauth-client:google-oauth-client:jar:1.39.0:compile com.google.protobuf:protobuf-java-util:jar:4.33.2:compile diff --git a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java index 6ee26e3338a0..34592a6ce5ea 100644 --- a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java +++ b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java @@ -1794,7 +1794,7 @@ private void verifyJwtAccess(Map> metadata, String expected assertEquals(CLIENT_EMAIL, signature.getPayload().getSubject()); if (expectedScopeClaim != null) { assertEquals(expectedScopeClaim, signature.getPayload().get("scope")); - assertFalse(signature.getPayload().containsKey("aud")); + assertNull(signature.getPayload().getAudience()); } else { assertEquals(JWT_AUDIENCE, signature.getPayload().getAudience()); assertFalse(signature.getPayload().containsKey("scope")); diff --git a/google-auth-library-java/pom.xml b/google-auth-library-java/pom.xml index be2539db5912..da445e4f5261 100644 --- a/google-auth-library-java/pom.xml +++ b/google-auth-library-java/pom.xml @@ -74,7 +74,7 @@ UTF-8 - 2.1.0 + 2.1.1 5.11.4 33.5.0-jre 2.0.33 diff --git a/grpc-gcp-java/pom.xml b/grpc-gcp-java/pom.xml index 9c25f79268a5..97f5b7ddde09 100644 --- a/grpc-gcp-java/pom.xml +++ b/grpc-gcp-java/pom.xml @@ -65,7 +65,7 @@ 2.65.0-SNAPSHOT 1.11.0 2.48.0 - 2.1.0 + 2.1.1 2.13.2 33.5.0-jre 4.33.2 diff --git a/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml b/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml index fdc6eab9271f..39e26678ee3a 100644 --- a/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml +++ b/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml @@ -216,7 +216,7 @@ com.google.http-client google-http-client - 1.47.1 + 2.1.1 test diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index d21454567dfb..2135cdb03c8d 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -28,7 +28,7 @@ consistent across modules in this repository --> 1.3.2 1.81.0 - 2.1.0 + 2.1.1 2.13.2 33.5.0-jre 4.33.2 diff --git a/sdk-platform-java/gax-java/dependencies.properties b/sdk-platform-java/gax-java/dependencies.properties index 1cf7a0cc71c9..6cfc7485c814 100644 --- a/sdk-platform-java/gax-java/dependencies.properties +++ b/sdk-platform-java/gax-java/dependencies.properties @@ -72,8 +72,8 @@ maven.com_google_api_api_common=com.google.api:api-common:2.55.2 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.7.0 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.58.2 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.58.2 -maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.47.1 -maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.47.1 +maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:2.1.1 +maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:2.1.1 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.24 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2