[WIP] apps CLI changes for karaf upgrade

Change-Id: I283efc39c7d4f4b31344f1d2d0cdd2b98a60932d
diff --git a/tools/build/bazel/yang.bzl b/tools/build/bazel/yang.bzl
index 93b619c..18b60e7 100644
--- a/tools/build/bazel/yang.bzl
+++ b/tools/build/bazel/yang.bzl
@@ -32,9 +32,9 @@
     "package org.onosproject.model.registrator.impl;\n" + \
     "\n" + \
     "import org.onosproject.yang.AbstractYangModelRegistrator;\n" + \
-    "import org.apache.felix.scr.annotations.Component;\n" + \
+    "import org.osgi.service.component.annotations.Component;\n" + \
     "\n" + \
-    "@Component(immediate = true)\n" + \
+    "@Component(immediate = true, service = YangModelRegistrator.class)\n" + \
     "public class YangModelRegistrator extends AbstractYangModelRegistrator {\n" + \
     "    public YangModelRegistrator() {\n" + \
     "        super(YangModelRegistrator.class);\n" + \