This is an automated email from the ASF dual-hosted git repository.
yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new d6139904db8 Use GCP libraries-bom version for all grpc (#31760)
d6139904db8 is described below
commit d6139904db83c6fd5fae105ac93b3729b42f1b65
Author: Michel Davit <[email protected]>
AuthorDate: Wed Jul 3 19:57:57 2024 +0200
Use GCP libraries-bom version for all grpc (#31760)
grpc-census, grpc-protobuf-lite and grpc-xds are now part of the
google_cloud_platform_libraries_bom
---
.../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 6f040c00cd1..ba6279a1349 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -763,7 +763,6 @@ class BeamModulePlugin implements Plugin<Project> {
google_cloud_vertexai :
"com.google.cloud:google-cloud-vertexai", //
google_cloud_platform_libraries_bom sets version
google_code_gson :
"com.google.code.gson:gson:$google_code_gson_version",
// google-http-client's version is explicitly declared for
sdks/java/maven-archetypes/examples
- // This version should be in line with the one in
com.google.cloud:libraries-bom.
google_http_client :
"com.google.http-client:google-http-client", //
google_cloud_platform_libraries_bom sets version
google_http_client_apache_v2 :
"com.google.http-client:google-http-client-apache-v2", //
google_cloud_platform_libraries_bom sets version
google_http_client_gson :
"com.google.http-client:google-http-client-gson", //
google_cloud_platform_libraries_bom sets version
@@ -776,8 +775,7 @@ class BeamModulePlugin implements Plugin<Project> {
grpc_alts : "io.grpc:grpc-alts", //
google_cloud_platform_libraries_bom sets version
grpc_api : "io.grpc:grpc-api", //
google_cloud_platform_libraries_bom sets version
grpc_auth : "io.grpc:grpc-auth", //
google_cloud_platform_libraries_bom sets version
- // Once grpc-xds is added to google_cloud_platform_libraries_bom, use
google_cloud_platform_libraries_bom instead.
- grpc_census :
"io.grpc:grpc-census:$grpc_version",
+ grpc_census : "io.grpc:grpc-census",
// google_cloud_platform_libraries_bom sets version
grpc_context : "io.grpc:grpc-context",
// google_cloud_platform_libraries_bom sets version
grpc_core : "io.grpc:grpc-core", //
google_cloud_platform_libraries_bom sets version
grpc_google_cloud_firestore_v1 :
"com.google.api.grpc:grpc-google-cloud-firestore-v1", //
google_cloud_platform_libraries_bom sets version
@@ -786,12 +784,11 @@ class BeamModulePlugin implements Plugin<Project> {
grpc_google_common_protos :
"com.google.api.grpc:grpc-google-common-protos", //
google_cloud_platform_libraries_bom sets version
grpc_grpclb : "io.grpc:grpc-grpclb",
// google_cloud_platform_libraries_bom sets version
grpc_protobuf : "io.grpc:grpc-protobuf",
// google_cloud_platform_libraries_bom sets version
- grpc_protobuf_lite :
"io.grpc:grpc-protobuf-lite:$grpc_version",
+ grpc_protobuf_lite :
"io.grpc:grpc-protobuf-lite", // google_cloud_platform_libraries_bom sets
version
grpc_netty : "io.grpc:grpc-netty", //
google_cloud_platform_libraries_bom sets version
grpc_netty_shaded :
"io.grpc:grpc-netty-shaded", // google_cloud_platform_libraries_bom sets version
grpc_stub : "io.grpc:grpc-stub", //
google_cloud_platform_libraries_bom sets version
- // Once grpc-xds is added to google_cloud_platform_libraries_bom, use
google_cloud_platform_libraries_bom instead.
- grpc_xds :
"io.grpc:grpc-xds:$grpc_version",
+ grpc_xds : "io.grpc:grpc-xds", //
google_cloud_platform_libraries_bom sets version
guava :
"com.google.guava:guava:$guava_version",
guava_testlib :
"com.google.guava:guava-testlib:$guava_version",
hadoop_client :
"org.apache.hadoop:hadoop-client:$hadoop_version",
@@ -826,7 +823,7 @@ class BeamModulePlugin implements Plugin<Project> {
jsonassert :
"org.skyscreamer:jsonassert:1.5.0",
jsr305 :
"com.google.code.findbugs:jsr305:$jsr305_version",
json_org :
"org.json:json:20231013", // Keep in sync with everit-json-schema /
google_cloud_platform_libraries_bom transitive deps.
- everit_json_schema :
"com.github.erosb:everit-json-schema:${everit_json_version}",
+ everit_json_schema :
"com.github.erosb:everit-json-schema:$everit_json_version",
junit : "junit:junit:4.13.1",
jupiter_api :
"org.junit.jupiter:junit-jupiter-api:$jupiter_version",
jupiter_engine :
"org.junit.jupiter:junit-jupiter-engine:$jupiter_version",
