commit 6a1ae71db1eaf7d1195442c2fc9f84e2cf6e50bf
author Carmelo Cascone <carmelo@opennetworking.org> Fri Aug 10 12:19:47 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Aug 13 18:51:36 2018 +0000
tree 1e4b97609e03db8c31fd486035dc15fab5f184e3
parent 0ed6443127176ad83f898ed2b2479f987de6532b

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

protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java

diff --git a/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java b/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java
index 464cb85..fb87571 100644
--- a/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java
+++ b/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java
@@ -43,8 +43,8 @@
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.grpc.api.GrpcChannelId;
 import org.onosproject.grpc.api.GrpcController;
-import org.onosproject.grpc.ctl.dummy.Dummy;
-import org.onosproject.grpc.ctl.dummy.DummyServiceGrpc;
+import org.onosproject.grpc.proto.dummy.Dummy;
+import org.onosproject.grpc.proto.dummy.DummyServiceGrpc;
 import org.onosproject.net.DeviceId;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;