Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

fix: update the runtime dependency grpc-java xds to googleapis #1643

Merged
merged 2 commits into from Mar 31, 2022
Merged

fix: update the runtime dependency grpc-java xds to googleapis #1643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c62222d
update the runtime dependency grpc-java xds to googleapis
mohanli-ml Mar 30, 2022
559fadb
Merge branch 'main' into grpc-java-googleapis
blakeli0 Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ ext {
'maven.io_grpc_grpc_protobuf': "io.grpc:grpc-protobuf:${libraries['version.io_grpc']}",
'maven.io_grpc_grpc_netty_shaded': "io.grpc:grpc-netty-shaded:${libraries['version.io_grpc']}",
'maven.io_grpc_grpc_alts': "io.grpc:grpc-alts:${libraries['version.io_grpc']}",
'maven.io_grpc_grpc_xds': "io.grpc:grpc-xds:${libraries['version.io_grpc']}",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to remove the code references to xds as well? Like this variable name?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still need this variable to protect the migration, and there is no need to change the variable name as xds protocol is still used.

'maven.io_grpc_grpc_googleapis': "io.grpc:grpc-googleapis:${libraries['version.io_grpc']}",
'maven.com_google_protobuf': "com.google.protobuf:protobuf-java:${libraries['version.com_google_protobuf']}",
'maven.com_google_protobuf_java_util': "com.google.protobuf:protobuf-java-util:${libraries['version.com_google_protobuf']}")
}
Expand Down Expand Up @@ -322,4 +322,4 @@ sonarqube {
property 'sonar.organization', 'googleapis'
property 'sonar.host.url', 'https://sonarcloud.io'
}
}
}
2 changes: 1 addition & 1 deletion gax-grpc/build.gradle
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ dependencies {
libraries['maven.io_grpc_grpc_protobuf'],
libraries['maven.io_grpc_grpc_stub'])

runtimeOnly libraries['maven.io_grpc_grpc_xds']
runtimeOnly libraries['maven.io_grpc_grpc_googleapis']

compileOnly libraries['maven.com_google_auto_value_auto_value']

Expand Down