move osgi_feature() and wrapped_osgi_jar() out of the bazel prelude
Change-Id: I0266ab4dbf0d0845ccbd940f2d0d3b230bd55260
diff --git a/features/BUILD b/features/BUILD
index b1aca0e..f188294 100644
--- a/features/BUILD
+++ b/features/BUILD
@@ -1,7 +1,8 @@
-osgi_feature (
+load("//tools/build/bazel:osgi_features.bzl", "osgi_feature")
+
+osgi_feature(
name = "onos-thirdparty-base",
description = "ONOS 3rd party dependencies",
- required_features = [],
included_bundles = [
"@atomix//jar",
"@commons_lang//jar",
@@ -44,13 +45,13 @@
"@jdom//jar",
"@sigar//jar",
],
+ required_features = [],
visibility = ["//visibility:public"],
)
-osgi_feature (
+osgi_feature(
name = "onos-thirdparty-web",
description = "ONOS 3rd party dependencies for web apps",
- required_features = [ "war", "onos-thirdparty-base" ],
included_bundles = [
"@jersey_common//jar",
"@javax_annotation_api//jar",
@@ -70,34 +71,41 @@
"@jersey_media_multipart//jar",
"@mimepull//jar",
],
- visibility = ["//visibility:public"],
-)
-
-osgi_feature (
- name = "onos-api",
- description = "ONOS services and model API",
- required_features = ["scr", "onos-thirdparty-base"],
- included_bundles =[
- "//utils/misc:onlab-misc",
- "//utils/osgi:onlab-osgi",
- "//core/api:onos-api",
- "//incubator/api:onos-incubator-api",
+ required_features = [
+ "war",
+ "onos-thirdparty-base",
],
visibility = ["//visibility:public"],
)
-osgi_feature (
+osgi_feature(
+ name = "onos-api",
+ description = "ONOS services and model API",
+ included_bundles = [
+ "//utils/misc:onlab-misc",
+ "//utils/osgi:onlab-osgi",
+ "//core/api:onos-api",
+ "//incubator/api:onos-incubator-api",
+ ],
+ required_features = [
+ "scr",
+ "onos-thirdparty-base",
+ ],
+ visibility = ["//visibility:public"],
+)
+
+osgi_feature(
name = "onos-core",
description = "ONOS core components",
- required_features = ["onos-api"],
included_bundles = [
"//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"],
)
diff --git a/protocols/p4runtime/proto/BUILD b/protocols/p4runtime/proto/BUILD
index 2f5e7fd..fe82bb3 100644
--- a/protocols/p4runtime/proto/BUILD
+++ b/protocols/p4runtime/proto/BUILD
@@ -1,3 +1,5 @@
+load("//tools/build/bazel:osgi_java_library.bzl", "wrapped_osgi_jar")
+
java_proto_library(
name = "p4_runtime_java_proto",
visibility = ["//visibility:public"],
diff --git a/tools/build_rules/prelude_bazel b/tools/build_rules/prelude_bazel
index 6114082..11451e0 100644
--- a/tools/build_rules/prelude_bazel
+++ b/tools/build_rules/prelude_bazel
@@ -1,8 +1,17 @@
-load("//tools/build/bazel:generate_workspace.bzl",
- "generated_java_libraries", "COMPILE", "CORE_DEPS", "JACKSON",
- "TEST_ADAPTERS", "TEST", "TEST_REST", "METRICS", "KRYO", "NETTY", "GRPC_1_3")
-
-load("//tools/build/bazel:osgi_java_library.bzl", "osgi_jar_with_tests", "osgi_jar", "wrapped_osgi_jar")
-load("//tools/build/bazel:osgi_features.bzl", "osgi_feature")
+load(
+ "//tools/build/bazel:generate_workspace.bzl",
+ "COMPILE",
+ "CORE_DEPS",
+ "GRPC_1_3",
+ "JACKSON",
+ "KRYO",
+ "METRICS",
+ "NETTY",
+ "TEST",
+ "TEST_ADAPTERS",
+ "TEST_REST",
+ "generated_java_libraries",
+)
+load("//tools/build/bazel:osgi_java_library.bzl", "osgi_jar", "osgi_jar_with_tests")
generated_java_libraries()