Skip to content
This repository was archived by the owner on May 14, 2026. It is now read-only.

Commit f3da795

Browse files
authored
build(deps): bump guava to 32.0.1-jre, google-http-client to 1.43.3. (#1791)
Discrepancy in guava version causing shared dependencies check failures. https://github.com/googleapis/sdk-platform-java/actions/runs/5335175946/jobs/9668027541 manual version bump to be consistent with #1774, #1775. #1776 **Summary of changes in PR:** - upgrade guava to 32.0.1-jre - upgrade google-http-client to 1.43.3 (with `j2objc-annotation:2.8`) - [temp solution] exclude `j2objc-annotations` from `protobuf-java-util` dependencies - upgrades `checker-qual` to 3.33.0, `j2objc-annotations` to 2.8 to be consistent - add comment to remove temp solution on next `protobuf` upgrade
1 parent 56033d5 commit f3da795

11 files changed

Lines changed: 42 additions & 11 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
<grpc.version>1.55.1</grpc.version>
3030
<google.auth.version>1.17.0</google.auth.version>
3131
<gson.version>2.10.1</gson.version>
32-
<guava.version>31.1-jre</guava.version>
32+
<guava.version>32.0.1-jre</guava.version>
33+
<!-- On next protobuf upgrade (to 3.23.3 or higher),
34+
remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
35+
For context: https://github.com/googleapis/sdk-platform-java/pull/1791-->
3336
<protobuf.version>3.23.2</protobuf.version>
3437
<maven.compiler.release>8</maven.compiler.release>
3538
</properties>

gapic-generator-java/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
<dependency>
383383
<groupId>com.google.guava</groupId>
384384
<artifactId>guava</artifactId>
385-
<version>32.0.0-jre</version>
385+
<version>32.0.1-jre</version>
386386
</dependency>
387387
<dependency>
388388
<groupId>com.google.api</groupId>
@@ -425,6 +425,12 @@
425425
<dependency>
426426
<groupId>com.google.protobuf</groupId>
427427
<artifactId>protobuf-java-util</artifactId>
428+
<exclusions>
429+
<exclusion>
430+
<groupId>com.google.j2objc</groupId>
431+
<artifactId>j2objc-annotations</artifactId>
432+
</exclusion>
433+
</exclusions>
428434
</dependency>
429435
<dependency>
430436
<groupId>io.grpc</groupId>

gax-java/dependencies.properties

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ version.gax_httpjson=2.29.1-SNAPSHOT
2525
# with the sources.
2626
# The protobuf version is only used for generating gradle files for showcase module,
2727
# not for self-service clients (from googleapis project).
28+
29+
# On next protobuf upgrade (to 3.23.3 or higher),
30+
# remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
31+
# For context: https://github.com/googleapis/sdk-platform-java/pull/1791
2832
version.com_google_protobuf=3.23.2
2933
version.google_java_format=1.15.0
3034
version.io_grpc=1.55.1
@@ -56,21 +60,21 @@ maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-nativ
5660
maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.26.0
5761
maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
5862
maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1
59-
maven.com_google_guava_guava=com.google.guava:guava:31.1-jre
63+
maven.com_google_guava_guava=com.google.guava:guava:32.0.1-jre
6064
maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1
6165
maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.12.0
6266
maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
6367
maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2
6468
maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.18.0
65-
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3
69+
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
6670
maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.1
6771
maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.1
6872
maven.com_google_api_api_common=com.google.api:api-common:2.7.0
6973
maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8
7074
maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.10.0
7175
maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.10.0
72-
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.43.1
73-
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.43.1
76+
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.43.3
77+
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.43.3
7478
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23
7579
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
7680
maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.1

gax-java/gax-httpjson/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@
6767
<dependency>
6868
<groupId>com.google.protobuf</groupId>
6969
<artifactId>protobuf-java-util</artifactId>
70+
<exclusions>
71+
<exclusion>
72+
<groupId>com.google.j2objc</groupId>
73+
<artifactId>j2objc-annotations</artifactId>
74+
</exclusion>
75+
</exclusions>
7076
</dependency>
7177
<dependency>
7278
<groupId>com.google.code.findbugs</groupId>

gax-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<dependency>
149149
<groupId>com.google.http-client</groupId>
150150
<artifactId>google-http-client-bom</artifactId>
151-
<version>1.43.1</version>
151+
<version>1.43.3</version>
152152
<type>pom</type>
153153
<scope>import</scope>
154154
</dependency>

java-common-protos/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<github.global.server>github</github.global.server>
5555
<site.installationModule>google-iam-parent</site.installationModule>
5656
<junit.version>4.13.2</junit.version>
57-
<guava.version>32.0.0-jre</guava.version>
57+
<guava.version>32.0.1-jre</guava.version>
5858
</properties>
5959

6060
<dependencyManagement>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
<dependency>
3434
<groupId>com.google.protobuf</groupId>
3535
<artifactId>protobuf-java-util</artifactId>
36+
<exclusions>
37+
<exclusion>
38+
<groupId>com.google.j2objc</groupId>
39+
<artifactId>j2objc-annotations</artifactId>
40+
</exclusion>
41+
</exclusions>
3642
</dependency>
3743
<dependency>
3844
<groupId>com.google.api.grpc</groupId>

java-shared-dependencies/dependency-convergence-check/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>com.google.guava</groupId>
2323
<artifactId>guava</artifactId>
24-
<version>32.0.0-jre</version>
24+
<version>32.0.1-jre</version>
2525
<scope>test</scope>
2626
</dependency>
2727
<dependency>

java-shared-dependencies/first-party-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<site.installationModule>${project.artifactId}</site.installationModule>
2525
<grpc-gcp.version>1.4.1</grpc-gcp.version>
2626
<gson.version>2.10.1</gson.version>
27-
<google.http-client.version>1.43.1</google.http-client.version>
27+
<google.http-client.version>1.43.3</google.http-client.version>
2828
<google.oauth-client.version>1.34.1</google.oauth-client.version>
2929
<google.api-client.version>2.2.0</google.api-client.version>
3030
</properties>

java-shared-dependencies/third-party-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>
3535
<httpcomponents.httpclient.version>4.5.14</httpcomponents.httpclient.version>
3636
<!-- ensure checker-qual version matches what Guava uses -->
37-
<checker-qual.version>3.32.0</checker-qual.version>
37+
<checker-qual.version>3.33.0</checker-qual.version>
3838
<perfmark-api.version>0.26.0</perfmark-api.version>
3939
</properties>
4040

0 commit comments

Comments
 (0)