From f3da79502cb451edb6e4e9d2d0727a4291884fbc Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 21 Jun 2023 17:54:06 -0400 Subject: [PATCH] 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 --- gapic-generator-java-pom-parent/pom.xml | 5 ++++- gapic-generator-java/pom.xml | 8 +++++++- gax-java/dependencies.properties | 12 ++++++++---- gax-java/gax-httpjson/pom.xml | 6 ++++++ gax-java/pom.xml | 2 +- java-common-protos/pom.xml | 2 +- java-core/google-cloud-core/pom.xml | 6 ++++++ .../dependency-convergence-check/pom.xml | 2 +- .../first-party-dependencies/pom.xml | 2 +- .../third-party-dependencies/pom.xml | 2 +- java-shared-dependencies/upper-bound-check/pom.xml | 6 ++++++ 11 files changed, 42 insertions(+), 11 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index a16f182bc5..bd925054ff 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -29,7 +29,10 @@ 1.55.1 1.17.0 2.10.1 - 31.1-jre + 32.0.1-jre + 3.23.2 8 diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index d6ce0dd9af..a731deec26 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -382,7 +382,7 @@ com.google.guava guava - 32.0.0-jre + 32.0.1-jre com.google.api @@ -425,6 +425,12 @@ com.google.protobuf protobuf-java-util + + + com.google.j2objc + j2objc-annotations + + io.grpc diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 3e576c0c98..f3ad60a877 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -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 @@ -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 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index fec3375fdb..8821c23560 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -67,6 +67,12 @@ com.google.protobuf protobuf-java-util + + + com.google.j2objc + j2objc-annotations + + com.google.code.findbugs diff --git a/gax-java/pom.xml b/gax-java/pom.xml index c942b8b298..b5c882031a 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -148,7 +148,7 @@ com.google.http-client google-http-client-bom - 1.43.1 + 1.43.3 pom import diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 4a17144793..eb8d079580 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -54,7 +54,7 @@ github google-iam-parent 4.13.2 - 32.0.0-jre + 32.0.1-jre diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index 35585749c8..48d18dde03 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -33,6 +33,12 @@ com.google.protobuf protobuf-java-util + + + com.google.j2objc + j2objc-annotations + + com.google.api.grpc diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index 050b67ad7c..db54d22329 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -21,7 +21,7 @@ com.google.guava guava - 32.0.0-jre + 32.0.1-jre test diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 446e6bf21f..4dc2165117 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -24,7 +24,7 @@ ${project.artifactId} 1.4.1 2.10.1 - 1.43.1 + 1.43.3 1.34.1 2.2.0 diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 771b56b2d9..d44092c4c6 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -34,7 +34,7 @@ 4.4.16 4.5.14 - 3.32.0 + 3.33.0 0.26.0 diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index 797c01cff3..4aeb9e49bc 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -144,6 +144,12 @@ com.google.protobuf protobuf-java-util + + + com.google.j2objc + j2objc-annotations + + com.google.api