Fix p4runtime runtime dependencies when building with Bazel
A convenient macro for packaging together all proto and gRPC libraries
in an OSGi jar is provided. Also re-packaging of gRPC core (to avoid OSGi
split problem) is simplified by depending on a patched fork of grpc-java.
Change-Id: Idb79a5bea8ae0bc57b146bda1fc47a4568d12c60
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 5962fb1..afc9768 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Fri, 10 Aug 2018 17:37:35 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 10 Aug 2018 23:10:39 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -980,6 +980,36 @@
)
native.maven_jar(
+ name = "com_google_api_grpc_proto_google_common_protos",
+ artifact = "com.google.api.grpc:proto-google-common-protos:1.0.0",
+ sha1 = "86f070507e28b930e50d218ee5b6788ef0dd05e6",
+ )
+
+ native.maven_jar(
+ name = "com_google_errorprone_error_prone_annotations",
+ artifact = "com.google.errorprone:error_prone_annotations:2.1.2",
+ sha1 = "6dcc08f90f678ac33e5ef78c3c752b6f59e63e0c",
+ )
+
+ native.maven_jar(
+ name = "com_google_auth_google_auth_library_credentials",
+ artifact = "com.google.auth:google-auth-library-credentials:0.9.0",
+ sha1 = "8e2b181feff6005c9cbc6f5c1c1e2d3ec9138d46",
+ )
+
+ native.maven_jar(
+ name = "io_opencensus_opencensus_api",
+ artifact = "io.opencensus:opencensus-api:0.12.3",
+ sha1 = "743f074095f29aa985517299545e72cc99c87de0",
+ )
+
+ native.maven_jar(
+ name = "io_opencensus_opencensus_contrib_grpc_metrics",
+ artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.12.3",
+ sha1 = "a4c7ff238a91b901c8b459889b6d0d7a9d889b4d",
+ )
+
+ native.maven_jar(
name = "openstack4j_core",
artifact = "org.pacesys:openstack4j-core:3.1.0",
sha1 = "634c2ad6728bb6e4cd91c950dd654aacb6f107a6",
@@ -1160,6 +1190,12 @@
)
native.maven_jar(
+ name = "runtime_grpc_context",
+ artifact = "io.grpc:grpc-context:1.14.0",
+ sha1 = "77252b5f926875891aaae5629e6ab2ef968cd6c6",
+ )
+
+ native.maven_jar(
name = "runtime_grpc_stub",
artifact = "io.grpc:grpc-stub:1.14.0",
sha1 = "74bfe83c0dc69bf903fff8df3568cbeb8b387d35",
@@ -2121,6 +2157,36 @@
)
native.java_library(
+ name = "com_google_api_grpc_proto_google_common_protos",
+ visibility = ["//visibility:public"],
+ exports = ["@com_google_api_grpc_proto_google_common_protos//jar"],
+ )
+
+ native.java_library(
+ name = "com_google_errorprone_error_prone_annotations",
+ visibility = ["//visibility:public"],
+ exports = ["@com_google_errorprone_error_prone_annotations//jar"],
+ )
+
+ native.java_library(
+ name = "com_google_auth_google_auth_library_credentials",
+ visibility = ["//visibility:public"],
+ exports = ["@com_google_auth_google_auth_library_credentials//jar"],
+ )
+
+ native.java_library(
+ name = "io_opencensus_opencensus_api",
+ visibility = ["//visibility:public"],
+ exports = ["@io_opencensus_opencensus_api//jar"],
+ )
+
+ native.java_library(
+ name = "io_opencensus_opencensus_contrib_grpc_metrics",
+ visibility = ["//visibility:public"],
+ exports = ["@io_opencensus_opencensus_contrib_grpc_metrics//jar"],
+ )
+
+ native.java_library(
name = "openstack4j_core",
visibility = ["//visibility:public"],
exports = ["@openstack4j_core//jar"],
@@ -2301,6 +2367,12 @@
)
native.java_library(
+ name = "runtime_grpc_context",
+ visibility = ["//visibility:public"],
+ exports = ["@runtime_grpc_context//jar"],
+ )
+
+ native.java_library(
name = "runtime_grpc_stub",
visibility = ["//visibility:public"],
exports = ["@runtime_grpc_stub//jar"],
@@ -2568,6 +2640,11 @@
artifact_map["@io_socket_client//jar"] = "mvn:io.socket:socket.io-client:jar:NON-OSGI:0.8.3"
artifact_map["@json//jar"] = "mvn:org.json:json:jar:NON-OSGI:20090211"
artifact_map["@engine_io_client//jar"] = "mvn:io.socket:engine.io-client:jar:NON-OSGI:0.8.3"
+artifact_map["@com_google_api_grpc_proto_google_common_protos//jar"] = "mvn:com.google.api.grpc:proto-google-common-protos:jar:NON-OSGI:1.0.0"
+artifact_map["@com_google_errorprone_error_prone_annotations//jar"] = "mvn:com.google.errorprone:error_prone_annotations:jar:NON-OSGI:2.1.2"
+artifact_map["@com_google_auth_google_auth_library_credentials//jar"] = "mvn:com.google.auth:google-auth-library-credentials:jar:NON-OSGI:0.9.0"
+artifact_map["@io_opencensus_opencensus_api//jar"] = "mvn:io.opencensus:opencensus-api:jar:NON-OSGI:0.12.3"
+artifact_map["@io_opencensus_opencensus_contrib_grpc_metrics//jar"] = "mvn:io.opencensus:opencensus-contrib-grpc-metrics:jar:NON-OSGI:0.12.3"
artifact_map["@openstack4j_core//jar"] = "mvn:org.pacesys:openstack4j-core:jar:3.1.0"
artifact_map["@openstack4j_http_connector//jar"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:jar:3.1.0"
artifact_map["@openstack4j_httpclient//jar"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-httpclient:jar:3.1.0"
@@ -2598,6 +2675,7 @@
artifact_map["@gnu_idn//jar"] = "mvn:org.gnu.inet:libidn:jar:NON-OSGI:1.15"
artifact_map["@sigar//jar"] = "mvn:org.knowhowlab.osgi:sigar:jar:1.6.5_01"
artifact_map["@runtime_grpc_core//jar"] = "mvn:io.grpc:grpc-core:jar:NON-OSGI:1.14.0"
+artifact_map["@runtime_grpc_context//jar"] = "mvn:io.grpc:grpc-context:jar:NON-OSGI:1.14.0"
artifact_map["@runtime_grpc_stub//jar"] = "mvn:io.grpc:grpc-stub:jar:NON-OSGI:1.14.0"
artifact_map["@runtime_grpc_netty//jar"] = "mvn:io.grpc:grpc-netty:jar:NON-OSGI:1.14.0"
artifact_map["@runtime_grpc_auth//jar"] = "mvn:io.grpc:grpc-auth:jar:NON-OSGI:1.14.0"