From 3edbe8ca7e8d6236ddaac626d6fae93c33fb0e72 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Wed, 13 Sep 2023 17:56:10 +0000 Subject: [PATCH 01/22] build(deps): bump grpc version to 1.58.0 --- gapic-generator-java-pom-parent/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 179c3efb40..3d08cf5bd4 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -27,7 +27,7 @@ consistent across modules in this repository --> 1.3.2 1.10.2 - 1.56.1 + 1.58.0 1.19.0 1.43.3 2.10.1 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index b8592ffe19..69e6c6271d 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -31,7 +31,7 @@ version.gax_httpjson=2.32.1-SNAPSHOT # 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.56.1 +version.io_grpc=1.58.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From dda9e62474f3670ef423877c22d0797d9854010e Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Wed, 13 Sep 2023 19:23:51 +0000 Subject: [PATCH 02/22] upudate protobuf to 3.24.0 --- gapic-generator-java-pom-parent/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 3d08cf5bd4..d7b99ba1df 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -35,7 +35,7 @@ - 3.23.2 + 3.24.0 8 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 69e6c6271d..dbc965d33d 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -29,7 +29,7 @@ version.gax_httpjson=2.32.1-SNAPSHOT # 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.com_google_protobuf=3.24.0 version.google_java_format=1.15.0 version.io_grpc=1.58.0 From 1cb8aa54f955b56c31bafd411439743f9c3c5e7c Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Wed, 13 Sep 2023 19:38:14 +0000 Subject: [PATCH 03/22] remove temporary j2objc exclusion --- gapic-generator-java-pom-parent/pom.xml | 3 --- java-shared-dependencies/upper-bound-check/pom.xml | 6 ------ 2 files changed, 9 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index d7b99ba1df..19dc527aac 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -32,9 +32,6 @@ 1.43.3 2.10.1 32.1.2-jre - 3.24.0 8 diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index ca3995a763..39d55d24aa 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -144,12 +144,6 @@ com.google.protobuf protobuf-java-util - - - com.google.j2objc - j2objc-annotations - - com.google.api From 977b725da88368a54c5149bb34a8da407d36a331 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Thu, 14 Sep 2023 17:18:10 +0000 Subject: [PATCH 04/22] upgrade errorprone version to 2.20.0 --- java-shared-dependencies/third-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 650f02c7ba..d9d0cfec07 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -28,7 +28,7 @@ 1.23 0.31.1 3.0.2 - 2.18.0 + 2.20.0 2.15.2 1.15 4.4.16 From 347b80e1f8eb757d61369236c5626661054cff1a Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Thu, 14 Sep 2023 17:23:01 +0000 Subject: [PATCH 05/22] update errorprone version to 2.20.0 in dependencies.properties for consistency --- gax-java/dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index dbc965d33d..5a95c2aaa7 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -65,7 +65,7 @@ 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_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.20.0 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.2 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.2 From a1abf4620897d5459b1e93f2501c80adf30b56dc Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Thu, 14 Sep 2023 17:25:35 +0000 Subject: [PATCH 06/22] update errorprone version in api-common and gapic-generator --- api-common-java/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index b2bf626928..ca2be0b3f7 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -63,7 +63,7 @@ com.google.errorprone error_prone_annotations - 2.18.0 + 2.20.0 compile diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index b86593ae4b..73bbda3def 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -457,7 +457,7 @@ com.google.errorprone error_prone_annotations - 2.18.0 + 2.20.0