Skip to content

Commit

Permalink
build(deps): bump guava to 32.0.1-jre, google-http-client to 1.43.3. (#…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
zhumin8 committed Jun 21, 2023
1 parent 56033d5 commit f3da795
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 11 deletions.
5 changes: 4 additions & 1 deletion gapic-generator-java-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
<grpc.version>1.55.1</grpc.version>
<google.auth.version>1.17.0</google.auth.version>
<gson.version>2.10.1</gson.version>
<guava.version>31.1-jre</guava.version>
<guava.version>32.0.1-jre</guava.version>
<!-- On next protobuf upgrade (to 3.23.3 or higher),
remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
For context: https://github.com/googleapis/sdk-platform-java/pull/1791-->
<protobuf.version>3.23.2</protobuf.version>
<maven.compiler.release>8</maven.compiler.release>
</properties>
Expand Down
8 changes: 7 additions & 1 deletion gapic-generator-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
<version>32.0.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
Expand Down Expand Up @@ -425,6 +425,12 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
12 changes: 8 additions & 4 deletions gax-java/dependencies.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ version.gax_httpjson=2.29.1-SNAPSHOT
# with the sources.
# The protobuf version is only used for generating gradle files for showcase module,
# not for self-service clients (from googleapis project).

# On next protobuf upgrade (to 3.23.3 or higher),
# remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
# For context: https://github.com/googleapis/sdk-platform-java/pull/1791
version.com_google_protobuf=3.23.2
version.google_java_format=1.15.0
version.io_grpc=1.55.1
Expand Down Expand Up @@ -56,21 +60,21 @@ maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-nativ
maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.26.0
maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1
maven.com_google_guava_guava=com.google.guava:guava:31.1-jre
maven.com_google_guava_guava=com.google.guava:guava:32.0.1-jre
maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1
maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.12.0
maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2
maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.18.0
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.1
maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.1
maven.com_google_api_api_common=com.google.api:api-common:2.7.0
maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8
maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.10.0
maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.10.0
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.43.1
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.43.1
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.43.3
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.43.3
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.1
Expand Down
6 changes: 6 additions & 0 deletions gax-java/gax-httpjson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gax-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>1.43.1</version>
<version>1.43.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion java-common-protos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<github.global.server>github</github.global.server>
<site.installationModule>google-iam-parent</site.installationModule>
<junit.version>4.13.2</junit.version>
<guava.version>32.0.0-jre</guava.version>
<guava.version>32.0.1-jre</guava.version>
</properties>

<dependencyManagement>
Expand Down
6 changes: 6 additions & 0 deletions java-core/google-cloud-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
<version>32.0.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion java-shared-dependencies/first-party-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<site.installationModule>${project.artifactId}</site.installationModule>
<grpc-gcp.version>1.4.1</grpc-gcp.version>
<gson.version>2.10.1</gson.version>
<google.http-client.version>1.43.1</google.http-client.version>
<google.http-client.version>1.43.3</google.http-client.version>
<google.oauth-client.version>1.34.1</google.oauth-client.version>
<google.api-client.version>2.2.0</google.api-client.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion java-shared-dependencies/third-party-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>
<httpcomponents.httpclient.version>4.5.14</httpcomponents.httpclient.version>
<!-- ensure checker-qual version matches what Guava uses -->
<checker-qual.version>3.32.0</checker-qual.version>
<checker-qual.version>3.33.0</checker-qual.version>
<perfmark-api.version>0.26.0</perfmark-api.version>
</properties>

Expand Down
6 changes: 6 additions & 0 deletions java-shared-dependencies/upper-bound-check/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
Expand Down

0 comments on commit f3da795

Please sign in to comment.