Cleaning up utils/ Buck files

Change-Id: Id8d0126f2ba06aab2dfba7a6a6760c263bdedba9
diff --git a/utils/osgi/BUCK b/utils/osgi/BUCK
index 7ffe40f..36d5819 100644
--- a/utils/osgi/BUCK
+++ b/utils/osgi/BUCK
@@ -1,29 +1,9 @@
-SRC = 'src/main/java/org/onlab/osgi/'
-TEST = 'src/test/java/org/onlab/osgi/'
-CURRENT_NAME = 'onlab-osgi'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:COMPILE',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar(
-  name = CURRENT_NAME,
-  srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests(
+  name = 'onlab-osgi',
   deps = COMPILE_DEPS,
-  visibility = ['PUBLIC'],
   package_name_root = 'org.onlab',
 )
-
-java_test(
-  name = 'onlab-osgi-tests',
-  srcs = glob([TEST + '/*.java']),
-  deps = COMPILE_DEPS +
-         TEST_DEPS +
-         [CURRENT_TARGET],
-  visibility = ['PUBLIC'],
-)