Merge branch 'master' into dev-karaf-4.2.1
Change-Id: If6c7d5f1dc6434ac8ea2fd9716b8ebeee38daa50
diff --git a/tools/build/bazel/modules.bzl b/tools/build/bazel/modules.bzl
index 26a5da4..dfa5cfe 100644
--- a/tools/build/bazel/modules.bzl
+++ b/tools/build/bazel/modules.bzl
@@ -77,7 +77,8 @@
"//web/api:onos-rest",
# "//web/gui2:onos-gui2",
"//web/gui:onos-gui",
- # "//incubator/protobuf/models:onos-incubator-protobuf-models",
+ "//incubator/protobuf/models/proto:onos-incubator-protobuf-models-proto",
+ "//incubator/protobuf/models:onos-incubator-protobuf-models",
# "//incubator/protobuf/services/nb:onos-incubator-protobuf-services-nb",
]
@@ -241,7 +242,7 @@
"//apps/powermanagement:onos-apps-powermanagement-oar",
"//apps/t3:onos-apps-t3-oar",
"//apps/simplefabric:onos-apps-simplefabric-oar",
- # "//apps/kafka-integration:onos-apps-kafka-integration-oar",
+ #"//apps/kafka-integration:onos-apps-kafka-integration-oar",
"//apps/rabbitmq:onos-apps-rabbitmq-oar",
"//apps/odtn/api:onos-apps-odtn-api-oar",
"//apps/odtn/service:onos-apps-odtn-service-oar",
@@ -297,8 +298,8 @@
"//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr",
"//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr",
"//apps/vtn/vtnweb:onos-apps-vtn-vtnweb",
- "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
- # "//apps/kafka-integration/app:onos-apps-kafka-integration-app",
+ #"//apps/kafka-integration/api:onos-apps-kafka-integration-api",
+ #"//apps/kafka-integration/app:onos-apps-kafka-integration-app",
]
FEATURES = [