Skip to content

Commit da60ee7

Browse files
committed
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
1 parent 95c7774 commit da60ee7

7 files changed

Lines changed: 12 additions & 12 deletions

File tree

.kokoro/java-storage-expected-flattened-dependencies.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ com.google.errorprone:error_prone_annotations:jar:2.48.0:compile
3333
com.google.guava:failureaccess:jar:1.0.3:compile
3434
com.google.guava:guava:jar:33.5.0-jre:compile
3535
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
36-
com.google.http-client:google-http-client-apache-v2:jar:2.1.0:compile
37-
com.google.http-client:google-http-client-appengine:jar:2.1.0:compile
38-
com.google.http-client:google-http-client-gson:jar:2.1.0:compile
39-
com.google.http-client:google-http-client-jackson2:jar:2.1.0:compile
40-
com.google.http-client:google-http-client:jar:2.1.0:compile
36+
com.google.http-client:google-http-client-apache-v2:jar:2.1.1:compile
37+
com.google.http-client:google-http-client-appengine:jar:2.1.1:compile
38+
com.google.http-client:google-http-client-gson:jar:2.1.1:compile
39+
com.google.http-client:google-http-client-jackson2:jar:2.1.1:compile
40+
com.google.http-client:google-http-client:jar:2.1.1:compile
4141
com.google.j2objc:j2objc-annotations:jar:3.1:compile
4242
com.google.oauth-client:google-oauth-client:jar:1.39.0:compile
4343
com.google.protobuf:protobuf-java-util:jar:4.33.2:compile

google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1794,7 +1794,7 @@ private void verifyJwtAccess(Map<String, List<String>> metadata, String expected
17941794
assertEquals(CLIENT_EMAIL, signature.getPayload().getSubject());
17951795
if (expectedScopeClaim != null) {
17961796
assertEquals(expectedScopeClaim, signature.getPayload().get("scope"));
1797-
assertFalse(signature.getPayload().containsKey("aud"));
1797+
assertNull(signature.getPayload().getAudience());
17981798
} else {
17991799
assertEquals(JWT_AUDIENCE, signature.getPayload().getAudience());
18001800
assertFalse(signature.getPayload().containsKey("scope"));

google-auth-library-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<properties>
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
77-
<project.google.http.version>2.1.0</project.google.http.version>
77+
<project.google.http.version>2.1.1</project.google.http.version>
7878
<project.junit.version>5.11.4</project.junit.version>
7979
<project.guava.version>33.5.0-jre</project.guava.version>
8080
<project.appengine.version>2.0.33</project.appengine.version>

grpc-gcp-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<api-common.version>2.65.0-SNAPSHOT</api-common.version><!-- {x-version-update:api-common:current} -->
6666
<auto-value.version>1.11.0</auto-value.version>
6767
<error-prone-annotations.version>2.48.0</error-prone-annotations.version>
68-
<google-http-client.version>2.1.0</google-http-client.version>
68+
<google-http-client.version>2.1.1</google-http-client.version>
6969
<gson.version>2.13.2</gson.version>
7070
<guava.version>33.5.0-jre</guava.version>
7171
<protobuf.version>4.33.2</protobuf.version>

java-bigquerystorage/google-cloud-bigquerystorage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
<dependency>
217217
<groupId>com.google.http-client</groupId>
218218
<artifactId>google-http-client</artifactId>
219-
<version>1.47.1</version>
219+
<version>2.1.1</version>
220220
<scope>test</scope>
221221
</dependency>
222222
<dependency>

sdk-platform-java/gapic-generator-java-pom-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
consistent across modules in this repository -->
2929
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
3030
<grpc.version>1.81.0</grpc.version>
31-
<google.http-client.version>2.1.0</google.http-client.version>
31+
<google.http-client.version>2.1.1</google.http-client.version>
3232
<gson.version>2.13.2</gson.version>
3333
<guava.version>33.5.0-jre</guava.version>
3434
<protobuf.version>4.33.2</protobuf.version>

sdk-platform-java/gax-java/dependencies.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ maven.com_google_api_api_common=com.google.api:api-common:2.55.2
7272
maven.org_threeten_threetenbp=org.threeten:threetenbp:1.7.0
7373
maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.58.2
7474
maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.58.2
75-
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.47.1
76-
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.47.1
75+
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:2.1.1
76+
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:2.1.1
7777
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.24
7878
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
7979
maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2

0 commit comments

Comments
 (0)