commit 1ae26c6c2812ce247f608c0aa782015b361ffd76
author Thomas Vachuska <tom@opennetworking.org> Mon Jul 09 13:40:16 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Jul 10 16:01:53 2018 +0000
tree 31242591dc85e9c7ac5274d08d46397bcecdacf6
parent 63192b0912583d5a71b0f9038243e3e2cc2f6239

Tweaking Bazel packaging.

Change-Id: I796f70e1324c40b5d21c3b784662138f2ec04655

tools/build/bazel/onos_app.bzl

diff --git a/tools/build/bazel/onos_app.bzl b/tools/build/bazel/onos_app.bzl
index 2431374..a5d3f82 100644
--- a/tools/build/bazel/onos_app.bzl
+++ b/tools/build/bazel/onos_app.bzl
@@ -249,7 +249,7 @@
         app_name = _get_app_name()
 
     maven_coords = "%s:%s:oar:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
-    feature_xml_coords = "%s:%s:xml:features:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
+    feature_xml_coords = "mvn:%s:%s:xml:features:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
 
     if title == None:
         print("Missing title for %s" % _get_name())
@@ -264,7 +264,7 @@
     #    feature_coords = '$(maven_coords %s)' % included_bundles[0]
 
     if not feature_coords:
-        feature_coords = "%s:%s:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
+        feature_coords = "mvn:%s:%s:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
 
     # TODO - intra app dependecies
     apps = []

tools/package/features/BUILD

diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index b7ad28d..28645f0 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -1,4 +1,5 @@
 load("//tools/build/bazel:osgi_features.bzl", "osgi_feature", "osgi_feature_repo")
+load("//:modules.bzl", "FEATURES")
 
 osgi_feature(
     name = "onos-thirdparty-base",
@@ -36,7 +37,6 @@
         "@typesafe_config//jar",
         "@concurrent_trees//jar",
         "@commons_io//jar",
-        "@jersey_client//jar",
         "@mapdb//jar",
         "@bcpkix_jdk15on//jar",
         "@bcprov_jdk15on//jar",
@@ -46,6 +46,7 @@
         "@sigar//jar",
     ],
     required_features = [],
+    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -68,12 +69,14 @@
         "@jersey_container_servlet//jar",
         "@jersey_container_servlet_core//jar",
         "@jersey_media_multipart//jar",
+        "@jersey_client//jar",
         "@mimepull//jar",
     ],
     required_features = [
         "war",
         "onos-thirdparty-base",
     ],
+    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -82,13 +85,16 @@
     included_bundles = [
         "//utils/misc:onlab-misc",
         "//utils/osgi:onlab-osgi",
+        "//utils/rest:onlab-rest",
         "//core/api:onos-api",
         "//incubator/api:onos-incubator-api",
     ],
     required_features = [
         "scr",
         "onos-thirdparty-base",
+        "onos-thirdparty-web",
     ],
+    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -98,25 +104,14 @@
         "//core/net:onos-core-net",
         "//core/common:onos-core-common",
         "//core/store/dist:onos-core-dist",
-        #        "//core/store/primitives:onos-core-primitives",
-        #        "//core/store/persistence:onos-core-persistence",
-        #        "//core/store/serializers:onos-core-serializers",
+        "//core/store/primitives:onos-core-primitives",
+        "//core/store/persistence:onos-core-persistence",
+        "//core/store/serializers:onos-core-serializers",
     ],
     required_features = ["onos-api"],
+    visibility = ["//visibility:public"],
 )
 
-FEATURES = [
-    "//tools/package/features:onos-thirdparty-base",
-    "//tools/package/features:onos-thirdparty-web",
-    "//tools/package/features:onos-api",
-    "//tools/package/features:onos-core",
-    #    "//tools/package/features:onos-incubator",
-    #    "//tools/package/features:onos-rest",
-    #    "//tools/package/features:onos-gui",
-    #    "//tools/package/features:onos-gui2",
-    #    "//tools/package/features:onos-cli",
-    #    "//tools/package/features:onos-security",
-]
 
 osgi_feature_repo(
     name = "onos-features",