diff --git a/protocols/bgp/api/BUCK b/protocols/bgp/api/BUCK
index 5f295c9..7b7ac98 100644
--- a/protocols/bgp/api/BUCK
+++ b/protocols/bgp/api/BUCK
@@ -8,7 +8,7 @@
     '//protocols/bgp/bgpio:onos-bgpio',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/bgp/bgpio/BUCK b/protocols/bgp/bgpio/BUCK
index 645be9e..3d6b280 100644
--- a/protocols/bgp/bgpio/BUCK
+++ b/protocols/bgp/bgpio/BUCK
@@ -11,7 +11,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/bgp/ctl/BUCK b/protocols/bgp/ctl/BUCK
index e4d653c..6336f97 100644
--- a/protocols/bgp/ctl/BUCK
+++ b/protocols/bgp/ctl/BUCK
@@ -17,7 +17,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/isis/BUCK b/protocols/isis/BUCK
index 966b1e7..77dba5a 100644
--- a/protocols/isis/BUCK
+++ b/protocols/isis/BUCK
@@ -4,13 +4,6 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:netty-buffer',
-    #'//lib:netty-'
-    #'//lib:org.apache.karaf.shell.console',
-    #'//cli:onos-cli',
-    #'//utils/rest:onlab-rest',
-    #'//lib:javax.ws.rs-api',
-    #'//core/store/serializers:onos-core-serializers',
-    #'//incubator/api:onos-incubator-api',
 ]
 
 TEST_DEPS = [
@@ -27,7 +20,7 @@
 
 # onos-isis-api
 
-java_library(
+osgi_jar(
     name = 'onos-isis-api',
     srcs = glob(['api/' + SRC + '*.java']),
     deps = COMPILE_DEPS,
@@ -45,7 +38,7 @@
 
 # onos-isis-isisio
 
-java_library(
+osgi_jar(
     name = 'onos-isis-isisio',
     srcs = glob(['isisio/' + SRC + '*.java']),
     deps = COMPILE_DEPS + [':onos-isis-api'],
diff --git a/protocols/netconf/api/BUCK b/protocols/netconf/api/BUCK
index 6625366..28ac267 100644
--- a/protocols/netconf/api/BUCK
+++ b/protocols/netconf/api/BUCK
@@ -7,7 +7,7 @@
     '//lib:CORE_DEPS',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/netconf/ctl/BUCK b/protocols/netconf/ctl/BUCK
index dae0d7c..8ff5134 100644
--- a/protocols/netconf/ctl/BUCK
+++ b/protocols/netconf/ctl/BUCK
@@ -13,7 +13,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/openflow/api/BUCK b/protocols/openflow/api/BUCK
index cdd21c3..c681174 100644
--- a/protocols/openflow/api/BUCK
+++ b/protocols/openflow/api/BUCK
@@ -13,7 +13,7 @@
     '//core/api:onos-api-tests',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/openflow/ctl/BUCK b/protocols/openflow/ctl/BUCK
index 3c2cd91..94dbbda 100644
--- a/protocols/openflow/ctl/BUCK
+++ b/protocols/openflow/ctl/BUCK
@@ -14,7 +14,7 @@
     '//core/api:onos-api-tests',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/ospf/api/BUCK b/protocols/ospf/api/BUCK
index e9f3762..92c6555 100644
--- a/protocols/ospf/api/BUCK
+++ b/protocols/ospf/api/BUCK
@@ -11,7 +11,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/ospf/ctl/BUCK b/protocols/ospf/ctl/BUCK
index df0e85b..5da15ee 100644
--- a/protocols/ospf/ctl/BUCK
+++ b/protocols/ospf/ctl/BUCK
@@ -13,7 +13,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/ospf/protocol/BUCK b/protocols/ospf/protocol/BUCK
index ee5bc2e..2c4cc5f 100644
--- a/protocols/ospf/protocol/BUCK
+++ b/protocols/ospf/protocol/BUCK
@@ -12,7 +12,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/ovsdb/api/BUCK b/protocols/ovsdb/api/BUCK
index a3a2279..04d088c 100644
--- a/protocols/ovsdb/api/BUCK
+++ b/protocols/ovsdb/api/BUCK
@@ -13,7 +13,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/ovsdb/ctl/BUCK b/protocols/ovsdb/ctl/BUCK
index 500358c..f360c0e 100644
--- a/protocols/ovsdb/ctl/BUCK
+++ b/protocols/ovsdb/ctl/BUCK
@@ -17,7 +17,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/ovsdb/rfc/BUCK b/protocols/ovsdb/rfc/BUCK
index 75edeb3..66e623b 100644
--- a/protocols/ovsdb/rfc/BUCK
+++ b/protocols/ovsdb/rfc/BUCK
@@ -9,7 +9,7 @@
     '//lib:netty-codec',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/pcep/api/BUCK b/protocols/pcep/api/BUCK
index a3f344e..83c98ae 100644
--- a/protocols/pcep/api/BUCK
+++ b/protocols/pcep/api/BUCK
@@ -8,7 +8,7 @@
     '//protocols/pcep/pcepio:onos-pcep-pcepio',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/pcep/ctl/BUCK b/protocols/pcep/ctl/BUCK
index a3c8e66..58fc0c9 100644
--- a/protocols/pcep/ctl/BUCK
+++ b/protocols/pcep/ctl/BUCK
@@ -9,7 +9,7 @@
     '//protocols/pcep/api:onos-pcep-controller-api',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/pcep/pcepio/BUCK b/protocols/pcep/pcepio/BUCK
index 1fb7c5b..559e9a8 100644
--- a/protocols/pcep/pcepio/BUCK
+++ b/protocols/pcep/pcepio/BUCK
@@ -11,7 +11,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/rest/api/BUCK b/protocols/rest/api/BUCK
index f3116ad..509253b 100644
--- a/protocols/rest/api/BUCK
+++ b/protocols/rest/api/BUCK
@@ -9,7 +9,7 @@
     '//utils/rest:onlab-rest',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/rest/ctl/BUCK b/protocols/rest/ctl/BUCK
index 1fc0618..613ac99 100644
--- a/protocols/rest/ctl/BUCK
+++ b/protocols/rest/ctl/BUCK
@@ -21,7 +21,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/snmp/api/BUCK b/protocols/snmp/api/BUCK
index d2e504b..4ff8c0f 100644
--- a/protocols/snmp/api/BUCK
+++ b/protocols/snmp/api/BUCK
@@ -13,7 +13,7 @@
     '//lib:mibs-rfc',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/protocols/snmp/ctl/BUCK b/protocols/snmp/ctl/BUCK
index 0c83b08..eff20ce 100644
--- a/protocols/snmp/ctl/BUCK
+++ b/protocols/snmp/ctl/BUCK
@@ -18,7 +18,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,