commit 86ad7bb5e77bc2ee14420f433e5a74dd2a2a7f8e
author Ray Milkey <ray@opennetworking.org> Thu Sep 27 12:32:28 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Fri Sep 28 11:21:43 2018 -0700
tree 5a2bf1c01b849467d485a0811a8f288e64259fdb
parent d84f89ba3d18fb8e9c44fa0bab004d24c56b0a81

[WIP] apps CLI changes for karaf upgrade

Change-Id: I283efc39c7d4f4b31344f1d2d0cdd2b98a60932d

modules.bzl

diff --git a/modules.bzl b/modules.bzl
index c4cf93f..a8abd08 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -23,7 +23,6 @@
     "//incubator/store:onos-incubator-store",
     "//incubator/rpc:onos-incubator-rpc",
     "//cli:onos-cli",
-    "//cli2:onos-cli2",
     "//protocols/rest/api:onos-protocols-rest-api",
     "//protocols/rest/ctl:onos-protocols-rest-ctl",
     "//protocols/bgp/bgpio:onos-protocols-bgp-bgpio",
@@ -306,13 +305,11 @@
     "//tools/package/features:onos-core",
     "//tools/package/features:onos-incubator",
     "//tools/package/features:onos-cli",
-    "//tools/package/features:onos-cli2",
     "//tools/package/features:onos-rest",
     "//tools/package/features:onos-gui",
     # "//tools/package/features:onos-gui2",
     # "//tools/package/features:onos-security",
 ]
 
-APPS = ["//drivers/default:onos-drivers-default-oar"]
-#APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS + MODELS + PIPELINES + \
-#       PROTOCOL_APPS + APP_JARS
+APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS + MODELS + PIPELINES + \
+       PROTOCOL_APPS + APP_JARS