Refactoring of provider buck builds.
Change-Id: I9b5e2566b83c13a8b7b086005a08a8182305ffdb
diff --git a/protocols/netconf/api/BUCK b/protocols/netconf/api/BUCK
index 28ac267..943b11d 100644
--- a/protocols/netconf/api/BUCK
+++ b/protocols/netconf/api/BUCK
@@ -1,15 +1,7 @@
-SRC = 'src/main/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-netconf-api'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
]
osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
)
diff --git a/protocols/netconf/ctl/BUCK b/protocols/netconf/ctl/BUCK
index 8ff5134..6c11e25 100644
--- a/protocols/netconf/ctl/BUCK
+++ b/protocols/netconf/ctl/BUCK
@@ -1,30 +1,10 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-netconf-ctl'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:ganymed-ssh2',
- '//protocols/netconf/api:onos-netconf-api'
+ '//protocols/netconf/api:onos-protocols-netconf-api'
]
-TEST_DEPS = [
- '//lib:TEST',
-]
-
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
)
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
-)