Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: update grpc dependencies to v1.65.0 #3034

Merged
merged 9 commits into from
Jul 23, 2024
Merged

deps: update grpc dependencies to v1.65.0 #3034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7bf0b7b
deps: update grpc dependencies to v1.65.0
renovate-bot Jul 9, 2024
c7ca5b6
Merge branch 'main' into renovate/grpc-dependencies
zhumin8 Jul 11, 2024
b81320e
Merge branch 'main' into renovate/grpc-dependencies
blakeli0 Jul 17, 2024
52c7be8
fix: bring in additional grpc dependencies with maven_install.
zhumin8 Jul 18, 2024
e48fc94
fix:remove IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS
zhumin8 Jul 18, 2024
3f15522
chore: bring grpc back to 1.65.0
zhumin8 Jul 18, 2024
574d0e2
fix: add override_targets for grpc_java
zhumin8 Jul 19, 2024
6f24629
add generate_compat_repositories.
zhumin8 Jul 22, 2024
d6f9140
revert adding generate_compat_repositories.
zhumin8 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down Expand Up @@ -98,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(
Expand Down
2 changes: 1 addition & 1 deletion gapic-generator-java-pom-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<!-- External dependencies, especially gRPC and Protobuf version, should be
consistent across modules in this repository -->
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<grpc.version>1.62.2</grpc.version>
<grpc.version>1.65.0</grpc.version>
<google.auth.version>1.24.0</google.auth.version>
<google.http-client.version>1.44.2</google.http-client.version>
<gson.version>2.11.0</gson.version>
Expand Down
2 changes: 1 addition & 1 deletion gax-java/dependencies.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Loading