commit d0d7ea101e0451c453f497f880afe519729ec920
author Thomas Vachuska <tom@opennetworking.org> Wed Oct 10 10:27:04 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Oct 15 19:13:28 2018 -0700
tree b8f61101475f6dab965b8d56f446021674a7a5c3
parent 8753edebaa03184fda6a630d993da6eb6766539d

Updating web socket stuff to for Karaf 4.2.1 migration.

Change-Id: Ie4a354e4c28461bbaffc6f33d1dfa95bc7514a2b

tools/package/etc/org.apache.karaf.features.cfg

diff --git a/tools/package/etc/org.apache.karaf.features.cfg b/tools/package/etc/org.apache.karaf.features.cfg
index 88818f6..33cb5cf 100644
--- a/tools/package/etc/org.apache.karaf.features.cfg
+++ b/tools/package/etc/org.apache.karaf.features.cfg
@@ -53,12 +53,12 @@
     webconsole/4.2.1, \
     scr/4.2.1, \
     war/4.2.1, \
-    onos-api/1.15.0.SNAPSHOT, \
-    onos-core/1.15.0.SNAPSHOT, \
-    onos-incubator/1.15.0.SNAPSHOT, \
-    onos-cli/1.15.0.SNAPSHOT, \
-    onos-rest/1.15.0.SNAPSHOT
-    #onos-gui
+    onos-api/$ONOS_VERSION, \
+    onos-core/$ONOS_VERSION, \
+    onos-incubator/$ONOS_VERSION, \
+    onos-cli/$ONOS_VERSION, \
+    onos-rest/$ONOS_VERSION
+    #onos-gui/$ONOS_VERSION
 
 
 #

tools/package/features/BUILD

diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index de3fd20..f4a68f8 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -134,12 +134,10 @@
     name = "onos-rest",
     description = "ONOS REST API components",
     included_bundles = [
-        "//utils/rest:onlab-rest",
         "//web/api:onos-rest",
     ],
     required_features = [
         "onos-api",
-        "onos-thirdparty-web",
     ],
     visibility = ["//visibility:public"],
 )
@@ -155,25 +153,13 @@
 )
 
 osgi_feature(
-    name = "onos-cli2",
-    description = "stripped down ONOS admin command console components",
-    included_bundles = [
-        "//cli2:onos-cli2",
-    ],
-    required_features = ["onos-api"],
-    visibility = ["//visibility:public"],
-)
-
-osgi_feature(
     name = "onos-gui",
     description = "ONOS GUI console components",
     included_bundles = [
         "//web/gui:onos-gui",
-        "//utils/rest:onlab-rest",
     ],
     required_features = [
         "onos-api",
-        "onos-thirdparty-web",
     ],
     visibility = ["//visibility:public"],
 )
@@ -183,22 +169,20 @@
     description = "ONOS GUI2 components",
     included_bundles = [
         "//web/gui2:onos-gui2",
-        "//utils/rest:onlab-rest",
     ],
     required_features = [
         "onos-api",
-        "onos-thirdparty-web",
     ],
     visibility = ["//visibility:public"],
 )
 
-osgi_feature(
-    name = "onos-security",
-    description = "Security-Mode ONOS",
-    included_bundles = [
-        "@org_apache_felix_framework_security//jar",
-        "//core/security:onos-security",
-    ],
-    required_features = ["onos-api"],
-    visibility = ["//visibility:public"],
-)
+#osgi_feature(
+#    name = "onos-security",
+#    description = "Security-Mode ONOS",
+#    included_bundles = [
+#        "@org_apache_felix_framework_security//jar",
+#        "//core/security:onos-security",
+#    ],
+#    required_features = ["onos-api"],
+#    visibility = ["//visibility:public"],
+#)