Fix build of protobuf-related components to support Bazel 0.22
- Bumped version of protobuf to 3.6.1.3 (includes fix for Bazel 0.22)
- Removed all protobuf and grpc dependencies from deps.json. Instead,
depends solely on what's provided by the external grpc and protobuf
workspaces.
- Use OSGi-wrapped protobuf and grpc JARs built with Bazel for runtime
- Add missing netty-related bundles to onos-thirdparty-base (required
by grpc)
Note, build with Bazel 0.22 is still broken because of
osgi_java_library.bzl, unless the following build arg is used:
build --incompatible_string_is_not_iterable=false
It seems the error is caused by dead code in osgi_java_library.bzl
that should be removed.
Change-Id: I749f1de25902bf9df5242444380f7224bc99b4b5
diff --git a/apps/openstacktelemetry/BUILD b/apps/openstacktelemetry/BUILD
index 5bd1683..955df03 100644
--- a/apps/openstacktelemetry/BUILD
+++ b/apps/openstacktelemetry/BUILD
@@ -16,13 +16,13 @@
"@simpleclient_hotspot//jar",
"@simpleclient_servlet//jar",
# gRPC dependencies (with patched core)
- ":grpc-core-repkg",
- "@runtime_grpc_stub//jar",
- "@runtime_grpc_netty//jar",
- "@runtime_grpc_auth//jar",
- "@runtime_grpc_protobuf//jar",
- "@runtime_grpc_protobuf_lite//jar",
- "@runtime_protobuf//jar",
+ "//protocols/grpc:grpc-bundle-core",
+ "//protocols/grpc:grpc-bundle-stub",
+ "//protocols/grpc:grpc-bundle-netty",
+ "//protocols/grpc:grpc-bundle-auth",
+ "//protocols/grpc:grpc-bundle-protobuf",
+ "//protocols/grpc:grpc-bundle-protobuf-lite",
+ "//protocols/grpc:protobuf-java-bundle",
"@com_google_api_grpc_proto_google_common_protos//jar",
"@com_google_errorprone_error_prone_annotations//jar",
"@com_google_auth_google_auth_library_credentials//jar",
@@ -44,10 +44,3 @@
title = "OpenStack Telemetry Application",
url = "https://wiki.onosproject.org/display/ONOS/SONA%3A+DC+Network+Virtualization",
)
-
-wrapped_osgi_jar(
- name = "grpc-core-repkg",
- jar = "@io_grpc_grpc_java//core",
- visibility = ["//visibility:public"],
- deps = ["@io_opencensus_opencensus_api//jar"],
-)