Updating BUCK files for 3rd party dependencies.
Change-Id: I24a8f0ada29548058c058df0ceacc29f8ad576b6
Note: lib/BUCK is not autogenerated
diff --git a/incubator/net/BUCK b/incubator/net/BUCK
index 28ee974..a4c2abd 100644
--- a/incubator/net/BUCK
+++ b/incubator/net/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/incubator/net/**/'
-TEST = 'src/test/java/org/onosproject/incubator/net/**/'
-CURRENT_NAME = 'onos-incubator-net'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
@@ -14,20 +9,10 @@
'//core/common:onos-core-common-tests',
'//incubator/store:onos-incubator-store',
'//core/store/serializers:onos-core-serializers',
+ '//lib:concurrent-trees',
]
-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],
+ test_deps = TEST_DEPS,
)