From 7bf0b7b96f23bb6ba7d70828a120971fad9114f1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 9 Jul 2024 18:08:33 +0000 Subject: [PATCH 1/7] deps: update grpc dependencies to v1.65.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 cdc906711c..5adc928d2c 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -26,7 +26,7 @@ 1.3.2 - 1.62.2 + 1.65.0 1.23.0 1.44.2 2.11.0 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 9ce735ee34..f8ebede84c 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -28,7 +28,7 @@ version.gax_httpjson=2.50.1-SNAPSHOT version.com_google_protobuf=3.25.3 version.google_java_format=1.15.0 -version.io_grpc=1.62.2 +version.io_grpc=1.65.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From 52c7be883e1754ed1678e2dfd85fa44b2d2e872a Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 18 Jul 2024 13:48:28 -0400 Subject: [PATCH 2/7] fix: bring in additional grpc dependencies with maven_install. --- WORKSPACE | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4e261d5aa6..dae4d4cf04 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -55,18 +55,17 @@ rules_jvm_external_setup() load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps") load("@rules_jvm_external//:defs.bzl", "maven_install") -maven_install( - artifacts = PROTOBUF_MAVEN_ARTIFACTS, - repositories = ["https://repo.maven.apache.org/maven2/"], -) +load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS") +load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS") _gapic_generator_java_version = "2.42.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ "com.google.api:gapic-generator-java:" + _gapic_generator_java_version, - ], + ] + PROTOBUF_MAVEN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS, fail_on_missing_checksum = False, + override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS, repositories = [ "m2Local", "https://repo.maven.apache.org/maven2/", From e48fc94fad24a1bd5aa8daaadff2bb3ff79e8378 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 18 Jul 2024 14:33:28 -0400 Subject: [PATCH 3/7] fix:remove IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS --- WORKSPACE | 2 -- gapic-generator-java-pom-parent/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index dae4d4cf04..99c98883b9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -56,7 +56,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "pr load("@rules_jvm_external//:defs.bzl", "maven_install") load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS") -load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS") _gapic_generator_java_version = "2.42.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} @@ -65,7 +64,6 @@ maven_install( "com.google.api:gapic-generator-java:" + _gapic_generator_java_version, ] + PROTOBUF_MAVEN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS, fail_on_missing_checksum = False, - override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS, repositories = [ "m2Local", "https://repo.maven.apache.org/maven2/", diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index c89e2bfaab..c6cf7245f1 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -26,7 +26,7 @@ 1.3.2 - 1.65.0 + 1.64.0 1.24.0 1.44.2 2.11.0 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 5da1c6fb6e..7b63f36904 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -28,7 +28,7 @@ version.gax_httpjson=2.50.1-SNAPSHOT version.com_google_protobuf=3.25.3 version.google_java_format=1.15.0 -version.io_grpc=1.65.0 +version.io_grpc=1.64.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From 3f15522217afeeea92261a46721f0102895d850f Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 18 Jul 2024 15:07:02 -0400 Subject: [PATCH 4/7] chore: bring grpc back to 1.65.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 c6cf7245f1..c89e2bfaab 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -26,7 +26,7 @@ 1.3.2 - 1.64.0 + 1.65.0 1.24.0 1.44.2 2.11.0 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 7b63f36904..5da1c6fb6e 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -28,7 +28,7 @@ version.gax_httpjson=2.50.1-SNAPSHOT version.com_google_protobuf=3.25.3 version.google_java_format=1.15.0 -version.io_grpc=1.64.0 +version.io_grpc=1.65.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From 574d0e2bbd36556db61aeaf35669741c9c28769f Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 19 Jul 2024 14:15:42 -0400 Subject: [PATCH 5/7] fix: add override_targets for grpc_java --- WORKSPACE | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 99c98883b9..8f9e57e6ce 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -56,6 +56,7 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "pr load("@rules_jvm_external//:defs.bzl", "maven_install") load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS") +load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS") _gapic_generator_java_version = "2.42.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} @@ -64,6 +65,7 @@ maven_install( "com.google.api:gapic-generator-java:" + _gapic_generator_java_version, ] + PROTOBUF_MAVEN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS, fail_on_missing_checksum = False, + override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS, repositories = [ "m2Local", "https://repo.maven.apache.org/maven2/", @@ -95,6 +97,10 @@ load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories") grpc_java_repositories() +load("@envoy_api//bazel:repositories.bzl", "api_dependencies") + +api_dependencies() + _disco_to_proto3_converter_commit = "ce8d8732120cdfb5bf4847c3238b5be8acde87e3" http_archive( From 6f246294dacc94eb7ac4da7d698900a45a6b8b00 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 22 Jul 2024 13:22:00 -0400 Subject: [PATCH 6/7] add generate_compat_repositories. --- WORKSPACE | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 8f9e57e6ce..603d3fd9d4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -66,12 +66,17 @@ maven_install( ] + PROTOBUF_MAVEN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS, fail_on_missing_checksum = False, override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS, + generate_compat_repositories = True, repositories = [ "m2Local", "https://repo.maven.apache.org/maven2/", ], ) +load("@maven//:compat.bzl", "compat_repositories") + +compat_repositories() + protobuf_deps() # Bazel rules. From d6f9140f6415d77bf4e088d9adfbc36e7f63bb03 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 22 Jul 2024 13:33:02 -0400 Subject: [PATCH 7/7] revert adding generate_compat_repositories. --- WORKSPACE | 5 ----- 1 file changed, 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 603d3fd9d4..8f9e57e6ce 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -66,17 +66,12 @@ maven_install( ] + PROTOBUF_MAVEN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS, fail_on_missing_checksum = False, override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS, - generate_compat_repositories = True, repositories = [ "m2Local", "https://repo.maven.apache.org/maven2/", ], ) -load("@maven//:compat.bzl", "compat_repositories") - -compat_repositories() - protobuf_deps() # Bazel rules.