Updating BUCK files

Change-Id: I24f279b42a270e59cf4bf4564e2aa4d81459c8e2
diff --git a/core/store/dist/BUCK b/core/store/dist/BUCK
index 6c56b3f..075612f 100644
--- a/core/store/dist/BUCK
+++ b/core/store/dist/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-dist'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//core/common:onos-core-common',
@@ -18,23 +13,13 @@
 
 TEST_DEPS = [
     '//lib:TEST',
-     '//core/api:onos-api-tests',
-     '//core/common:onos-core-common-tests',
+    '//core/api:onos-api-tests',
+    '//core/common:onos-core-common-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-dist',
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-)
-
-java_test(
-    name= 'onos-core-dist-tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )