More app BUCK file refactoring
Change-Id: I97506033c4c0cf145c558df7d4f86f37c7fe8332
diff --git a/apps/metrics/BUCK b/apps/metrics/BUCK
index eb607f1..a4b7f4c 100644
--- a/apps/metrics/BUCK
+++ b/apps/metrics/BUCK
@@ -1,9 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-app-metrics'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
@@ -12,24 +6,13 @@
'//cli:onos-cli',
]
-TEST_DEPS = [
- '//lib:TEST',
-]
-
-java_library(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
- resources_root = 'src/main/resources',
- resources = glob(['src/main/resources/**']),
)
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
+onos_app (
+ title = 'OpenStack Interface App',
+ category = 'Utility',
+ url = 'http://onosproject.org',
+ description = 'Openstack Interface Application.',
)