diff --git a/lib/BUCK b/lib/BUCK
index 4181798..014ac38 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed, 8 Aug 2018 21:33:43 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Thu, 9 Aug 2018 18:35:50 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -19,7 +19,7 @@
     ':commons-lang3',
     ':commons-io',
     ':commons-pool',
-    ':guava',
+    ':com_google_guava_guava',
     ':slf4j-api',
     ':osgi-core',
     ':org.osgi.compendium',
@@ -27,7 +27,7 @@
     ':org.apache.felix.scr',
     ':org.apache.karaf.features.core',
     ':org.apache.karaf.system.core',
-    ':jsr305',
+    ':com_google_code_findbugs_jsr305',
     ':org.apache.servicemix.bundles.dom4j',
   ],
 )
@@ -51,7 +51,7 @@
     ':easymock',
     ':hamcrest-all',
     ':hamcrest-optional',
-    ':guava-testlib',
+    ':com_google_guava_guava_testlib',
     '//utils/junit:onlab-junit',
   ],
 )
@@ -90,7 +90,7 @@
     ':hk2-utils',
     ':javax.inject',
     ':hk2-osgi-resource-locator',
-    ':javax.annotation-api',
+    ':javax.annotation-api-mvn',
     ':validation-api',
     '//core/common:onos-core-common',
     '//core/api:onos-api-tests',
@@ -103,35 +103,8 @@
   name = 'NETTY',
   visibility = ['PUBLIC'],
   exported_deps = [
-    ':netty-buffer',
-    ':netty-common',
-  ],
-)
-
-osgi_feature_group(
-  name = 'GRPC_1.3',
-  visibility = ['PUBLIC'],
-  exported_deps = [
-    ':grpc-protobuf-1.3.1',
-    ':grpc-stub-1.3.1',
-    ':grpc-netty-1.3.1',
-    ':grpc-auth-1.3.1',
-    ':grpc-context-1.3.1',
-    ':google-truth-0.28',
-  ],
-)
-
-osgi_feature_group(
-  name = 'GRPC_TEST_1.3',
-  visibility = ['PUBLIC'],
-  exported_deps = [
-    ':grpc-testing-1.3.1',
-    ':grpc-testing-proto-1.3.1',
-    ':google-code-findbugs-3.0.0',
-    ':google-errorprone-2.0.19',
-    ':google-instrumentation-0.3.0',
-    ':junit-dep',
-    ':objenesis',
+    ':io_netty_netty_buffer',
+    ':io_netty_netty_common',
   ],
 )
 
@@ -213,6 +186,33 @@
   ],
 )
 
+osgi_feature_group(
+  name = 'GRPC_1.3',
+  visibility = ['PUBLIC'],
+  exported_deps = [
+    ':grpc-protobuf-1.3.1',
+    ':grpc-stub-1.3.1',
+    ':grpc-netty-1.3.1',
+    ':grpc-auth-1.3.1',
+    ':grpc-context-1.3.1',
+    ':google-truth-0.28',
+  ],
+)
+
+osgi_feature_group(
+  name = 'GRPC_TEST_1.3',
+  visibility = ['PUBLIC'],
+  exported_deps = [
+    ':grpc-testing-1.3.1',
+    ':grpc-testing-proto-1.3.1',
+    ':google-code-findbugs-3.0.0',
+    ':google-errorprone-2.0.19',
+    ':google-instrumentation-0.3.0',
+    ':junit-dep',
+    ':objenesis',
+  ],
+)
+
 remote_jar (
   name = 'aopalliance-repackaged',
   out = 'aopalliance-repackaged-2.5.0-b42.jar',
@@ -493,15 +493,6 @@
 )
 
 remote_jar (
-  name = 'error_prone_annotations',
-  out = 'error_prone_annotations-2.0.18.jar',
-  url = 'mvn:com.google.errorprone:error_prone_annotations:jar:2.0.18',
-  sha1 = '5f65affce1684999e2f4024983835efc3504012e',
-  maven_coords = 'com.google.errorprone:error_prone_annotations:jar:NON-OSGI:2.0.18',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
   name = 'ganymed-ssh2',
   out = 'ganymed-ssh2-262.jar',
   url = 'mvn:ch.ethz.ganymed:ganymed-ssh2:jar:262',
@@ -520,7 +511,7 @@
 )
 
 remote_jar (
-  name = 'gson',
+  name = 'com_google_code_gson_gson',
   out = 'gson-2.7.jar',
   url = 'mvn:com.google.code.gson:gson:jar:2.7',
   sha1 = '751f548c85fa49f330cecbb1875893f971b33c4e',
@@ -529,7 +520,7 @@
 )
 
 remote_jar (
-  name = 'guava',
+  name = 'com_google_guava_guava',
   out = 'guava-22.0.jar',
   url = 'mvn:com.google.guava:guava:jar:22.0',
   sha1 = '3564ef3803de51fb0530a8377ec6100b33b0d073',
@@ -538,7 +529,7 @@
 )
 
 remote_jar (
-  name = 'guava-testlib',
+  name = 'com_google_guava_guava_testlib',
   out = 'guava-testlib-22.0.jar',
   url = 'mvn:com.google.guava:guava-testlib:jar:22.0',
   sha1 = '3be1b88f1cfc6592acbcbfe1f3a420f79eb2b146',
@@ -700,7 +691,7 @@
 )
 
 remote_jar (
-  name = 'javax.annotation-api',
+  name = 'javax.annotation-api-mvn',
   out = 'javax.annotation-api-1.2.jar',
   url = 'mvn:javax.annotation:javax.annotation-api:jar:1.2',
   sha1 = '479c1e06db31c432330183f5cae684163f186146',
@@ -907,7 +898,7 @@
 )
 
 remote_jar (
-  name = 'jsr305',
+  name = 'com_google_code_findbugs_jsr305',
   out = 'jsr305-3.0.1.jar',
   url = 'mvn:com.google.code.findbugs:jsr305:jar:3.0.1',
   sha1 = 'f7be08ec23c21485b9b5a1cf1654c2ec8c58168d',
@@ -1015,7 +1006,7 @@
 )
 
 remote_jar (
-  name = 'netty',
+  name = 'io_netty_netty',
   out = 'netty-3.10.5.Final.jar',
   url = 'mvn:io.netty:netty:jar:3.10.5.Final',
   sha1 = '9ca7d55d246092bddd29b867706e2f6c7db701a0',
@@ -1024,83 +1015,110 @@
 )
 
 remote_jar (
-  name = 'netty-buffer',
-  out = 'netty-buffer-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-buffer:jar:4.1.8.Final',
-  sha1 = '43292c2622e340a0d07178c341ca3bdf3d662034',
-  maven_coords = 'io.netty:netty-buffer:4.1.8.Final',
+  name = 'io_netty_netty_buffer',
+  out = 'netty-buffer-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-buffer:jar:4.1.27.Final',
+  sha1 = 'aafe2b9fb0d8f3b200cf10b9fd6486c6a722d7a1',
+  maven_coords = 'io.netty:netty-buffer:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-codec',
-  out = 'netty-codec-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-codec:jar:4.1.8.Final',
-  sha1 = '1bd0a2d032e5c7fc3f42c1b483d0f4c57eb516a3',
-  maven_coords = 'io.netty:netty-codec:4.1.8.Final',
+  name = 'io_netty_netty_codec',
+  out = 'netty-codec-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-codec:jar:4.1.27.Final',
+  sha1 = 'd2653d78ebaa650064768fb26b10051f5c8efb2c',
+  maven_coords = 'io.netty:netty-codec:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-common',
-  out = 'netty-common-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-common:jar:4.1.8.Final',
-  sha1 = 'ee62c80318413d2375d145e51e48d7d35c901324',
-  maven_coords = 'io.netty:netty-common:4.1.8.Final',
+  name = 'io_netty_netty_common',
+  out = 'netty-common-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-common:jar:4.1.27.Final',
+  sha1 = '6a12a969c27fb37b230c4bde5a67bd822fa6b7a4',
+  maven_coords = 'io.netty:netty-common:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-handler',
-  out = 'netty-handler-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-handler:jar:4.1.8.Final',
-  sha1 = 'db01139bfb11afd009a695eef55b43bbf22c4ef5',
-  maven_coords = 'io.netty:netty-handler:4.1.8.Final',
+  name = 'io_netty_netty_handler',
+  out = 'netty-handler-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-handler:jar:4.1.27.Final',
+  sha1 = '21bd9cf565390a8d72579b8664303e3c175dfc6a',
+  maven_coords = 'io.netty:netty-handler:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-transport',
-  out = 'netty-transport-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-transport:jar:4.1.8.Final',
-  sha1 = '905b5dadce881c9824b3039c0df36dabbb7b6a07',
-  maven_coords = 'io.netty:netty-transport:4.1.8.Final',
+  name = 'io_netty_netty_handler_proxy',
+  out = 'netty-handler-proxy-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-handler-proxy:jar:4.1.27.Final',
+  sha1 = '1a822ce7760bc6eb4937b7e448c9e081fedcc807',
+  maven_coords = 'io.netty:netty-handler-proxy:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-transport-native-epoll',
-  out = 'netty-transport-native-epoll-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.1.8.Final',
-  sha1 = 'de9052874d9ff9b411bfc465869f620cab643d8d',
-  maven_coords = 'io.netty:netty-transport-native-epoll:4.1.8.Final',
+  name = 'io_netty_netty_transport',
+  out = 'netty-transport-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-transport:jar:4.1.27.Final',
+  sha1 = 'b5c2da3ea89dd67320925f1504c9eb3615241b7c',
+  maven_coords = 'io.netty:netty-transport:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-resolver',
-  out = 'netty-resolver-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-resolver:jar:4.1.8.Final',
-  sha1 = '2e116cdd5edc01b2305072b1dbbd17c0595dbfef',
-  maven_coords = 'io.netty:netty-resolver:4.1.8.Final',
+  name = 'io_netty_netty_transport_native_unix_common',
+  out = 'netty-transport-native-unix-common-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-transport-native-unix-common:jar:4.1.27.Final',
+  sha1 = '2b0667fe5c1df78c6cfbf9d53ad8b1fb533fb8e8',
+  maven_coords = 'io.netty:netty-transport-native-unix-common:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-codec-http2',
-  out = 'netty-codec-http2-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-codec-http2:jar:4.1.8.Final',
-  sha1 = '105a99ee5767463370ccc3d2e16800bd99f5648e',
-  maven_coords = 'io.netty:netty-codec-http2:4.1.8.Final',
+  name = 'io_netty_netty_transport-native-epoll',
+  out = 'netty-transport-native-epoll-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.1.27.Final',
+  sha1 = 'addbd481940a3cce57cb5736ecef5db909b7b5d0',
+  maven_coords = 'io.netty:netty-transport-native-epoll:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'netty-codec-http',
-  out = 'netty-codec-http-4.1.8.Final.jar',
-  url = 'mvn:io.netty:netty-codec-http:jar:4.1.8.Final',
-  sha1 = '1e88617c4a6c88da7e86fdbbd9494d22a250c879',
-  maven_coords = 'io.netty:netty-codec-http:4.1.8.Final',
+  name = 'io_netty_netty_resolver',
+  out = 'netty-resolver-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-resolver:jar:4.1.27.Final',
+  sha1 = '2536447ef9605ccb2b5203aa22392c6514484ea9',
+  maven_coords = 'io.netty:netty-resolver:4.1.27.Final',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'io_netty_netty_codec-http2',
+  out = 'netty-codec-http2-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-codec-http2:jar:4.1.27.Final',
+  sha1 = '3769790a2033667d663f9a526d5b63cfecdbdf4e',
+  maven_coords = 'io.netty:netty-codec-http2:4.1.27.Final',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'io_netty_netty_codec-http',
+  out = 'netty-codec-http-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-codec-http:jar:4.1.27.Final',
+  sha1 = 'a1722d6bcbbef1c4c7877e8bf38b07a3db5ed07f',
+  maven_coords = 'io.netty:netty-codec-http:4.1.27.Final',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'io_netty_netty_codec-socks',
+  out = 'netty-codec-socks-4.1.27.Final.jar',
+  url = 'mvn:io.netty:netty-codec-socks:jar:4.1.27.Final',
+  sha1 = '285b09af98764cf02e4b77b3d95af188469a7133',
+  maven_coords = 'io.netty:netty-codec-socks:4.1.27.Final',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -1616,6 +1634,105 @@
 )
 
 remote_jar (
+  name = 'bcpkix-jdk15on',
+  out = 'bcpkix-jdk15on-1.59.jar',
+  url = 'mvn:org.bouncycastle:bcpkix-jdk15on:jar:1.59',
+  sha1 = '9cef0aab8a4bb849a8476c058ce3ff302aba3fff',
+  maven_coords = 'org.bouncycastle:bcpkix-jdk15on:1.59',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'bcprov-jdk15on',
+  out = 'bcprov-jdk15on-1.59.jar',
+  url = 'mvn:org.bouncycastle:bcprov-jdk15on:jar:1.59',
+  sha1 = '2507204241ab450456bdb8e8c0a8f986e418bd99',
+  maven_coords = 'org.bouncycastle:bcprov-jdk15on:1.59',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'hamcrest-optional',
+  out = 'hamcrest-optional-1.1.0.jar',
+  url = 'mvn:com.spotify:hamcrest-optional:jar:1.1.0',
+  sha1 = 'c2dfe3a43794b15fb4c28de0027fe6e249855b3b',
+  maven_coords = 'com.spotify:hamcrest-optional:jar:NON-OSGI:1.1.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'swagger-annotations',
+  out = 'swagger-annotations-1.5.16.jar',
+  url = 'mvn:io.swagger:swagger-annotations:jar:1.5.16',
+  sha1 = '935f1f2fed2cbdd7a0513981d6c53201e21155f4',
+  maven_coords = 'io.swagger:swagger-annotations:1.5.16',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'kafka-clients',
+  out = 'org.apache.servicemix.bundles.kafka-clients-0.8.2.2_1.jar',
+  url = 'mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:jar:0.8.2.2_1',
+  sha1 = '19ba66200cc3617fad12843788dff818b9882008',
+  maven_coords = 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:0.8.2.2_1',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'tinder-xmpp',
+  out = 'tinder-1.3.0.jar',
+  url = 'mvn:org.igniterealtime:tinder:jar:1.3.0',
+  sha1 = '46353ded2a1d1a87d17600206d61814eb0b8a711',
+  maven_coords = 'org.igniterealtime:tinder:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'aalto-xml',
+  out = 'aalto-xml-1.0.0.jar',
+  url = 'mvn:com.fasterxml:aalto-xml:jar:1.0.0',
+  sha1 = 'aeae9e8a71914e7f5efc8a69d2f5cb1f2224f2c6',
+  maven_coords = 'com.fasterxml:aalto-xml:1.0.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'stax2-api',
+  out = 'stax2-api-4.0.0.jar',
+  url = 'mvn:org.codehaus.woodstox:stax2-api:jar:4.0.0',
+  sha1 = '6fa8b05f7587a3cb819d223ee0b0de0c126e3dd1',
+  maven_coords = 'org.codehaus.woodstox:stax2-api:4.0.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'concurrent-hashmap',
+  out = 'concurrentlinkedhashmap-lru-1.0.jar',
+  url = 'mvn:com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:jar:1.0',
+  sha1 = 'db7b7a28b835db4717d4aaf31f5d4441887a6d46',
+  maven_coords = 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:jar:NON-OSGI:1.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'gnu-idn',
+  out = 'libidn-1.15.jar',
+  url = 'mvn:org.gnu.inet:libidn:jar:1.15',
+  sha1 = 'b5bede3c1c031a827b604da31768ddaf833495c6',
+  maven_coords = 'org.gnu.inet:libidn:jar:NON-OSGI:1.15',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'sigar',
+  out = 'sigar-1.6.5_01.jar',
+  url = 'mvn:org.knowhowlab.osgi:sigar:jar:1.6.5_01',
+  sha1 = '58eb4af0dc4a1d331cd7620767216494e2984dea',
+  maven_coords = 'org.knowhowlab.osgi:sigar:1.6.5_01',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'grpc-core-1.3.1',
   out = 'grpc-core-1.3.1.jar',
   url = 'mvn:io.grpc:grpc-core:jar:1.3.1',
@@ -1750,102 +1867,3 @@
   visibility = [ 'PUBLIC' ],
 )
 
-remote_jar (
-  name = 'bcpkix-jdk15on',
-  out = 'bcpkix-jdk15on-1.59.jar',
-  url = 'mvn:org.bouncycastle:bcpkix-jdk15on:jar:1.59',
-  sha1 = '9cef0aab8a4bb849a8476c058ce3ff302aba3fff',
-  maven_coords = 'org.bouncycastle:bcpkix-jdk15on:1.59',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'bcprov-jdk15on',
-  out = 'bcprov-jdk15on-1.59.jar',
-  url = 'mvn:org.bouncycastle:bcprov-jdk15on:jar:1.59',
-  sha1 = '2507204241ab450456bdb8e8c0a8f986e418bd99',
-  maven_coords = 'org.bouncycastle:bcprov-jdk15on:1.59',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'hamcrest-optional',
-  out = 'hamcrest-optional-1.1.0.jar',
-  url = 'mvn:com.spotify:hamcrest-optional:jar:1.1.0',
-  sha1 = 'c2dfe3a43794b15fb4c28de0027fe6e249855b3b',
-  maven_coords = 'com.spotify:hamcrest-optional:jar:NON-OSGI:1.1.0',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'swagger-annotations',
-  out = 'swagger-annotations-1.5.16.jar',
-  url = 'mvn:io.swagger:swagger-annotations:jar:1.5.16',
-  sha1 = '935f1f2fed2cbdd7a0513981d6c53201e21155f4',
-  maven_coords = 'io.swagger:swagger-annotations:1.5.16',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'kafka-clients',
-  out = 'org.apache.servicemix.bundles.kafka-clients-0.8.2.2_1.jar',
-  url = 'mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:jar:0.8.2.2_1',
-  sha1 = '19ba66200cc3617fad12843788dff818b9882008',
-  maven_coords = 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:0.8.2.2_1',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'tinder-xmpp',
-  out = 'tinder-1.3.0.jar',
-  url = 'mvn:org.igniterealtime:tinder:jar:1.3.0',
-  sha1 = '46353ded2a1d1a87d17600206d61814eb0b8a711',
-  maven_coords = 'org.igniterealtime:tinder:jar:NON-OSGI:1.3.0',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'aalto-xml',
-  out = 'aalto-xml-1.0.0.jar',
-  url = 'mvn:com.fasterxml:aalto-xml:jar:1.0.0',
-  sha1 = 'aeae9e8a71914e7f5efc8a69d2f5cb1f2224f2c6',
-  maven_coords = 'com.fasterxml:aalto-xml:1.0.0',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'stax2-api',
-  out = 'stax2-api-4.0.0.jar',
-  url = 'mvn:org.codehaus.woodstox:stax2-api:jar:4.0.0',
-  sha1 = '6fa8b05f7587a3cb819d223ee0b0de0c126e3dd1',
-  maven_coords = 'org.codehaus.woodstox:stax2-api:4.0.0',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'concurrent-hashmap',
-  out = 'concurrentlinkedhashmap-lru-1.0.jar',
-  url = 'mvn:com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:jar:1.0',
-  sha1 = 'db7b7a28b835db4717d4aaf31f5d4441887a6d46',
-  maven_coords = 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:jar:NON-OSGI:1.0',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'gnu-idn',
-  out = 'libidn-1.15.jar',
-  url = 'mvn:org.gnu.inet:libidn:jar:1.15',
-  sha1 = 'b5bede3c1c031a827b604da31768ddaf833495c6',
-  maven_coords = 'org.gnu.inet:libidn:jar:NON-OSGI:1.15',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'sigar',
-  out = 'sigar-1.6.5_01.jar',
-  url = 'mvn:org.knowhowlab.osgi:sigar:jar:1.6.5_01',
-  sha1 = '58eb4af0dc4a1d331cd7620767216494e2984dea',
-  maven_coords = 'org.knowhowlab.osgi:sigar:1.6.5_01',
-  visibility = [ 'PUBLIC' ],
-)
-
diff --git a/lib/deps.json b/lib/deps.json
index 44e9827..625869f 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -8,7 +8,7 @@
       "commons-lang3",
       "commons-io",
       "commons-pool",
-      "guava",
+      "com_google_guava_guava",
       "slf4j-api",
       "osgi-core",
       "org.osgi.compendium",
@@ -16,7 +16,7 @@
       "org.apache.felix.scr",
       "org.apache.karaf.features.core",
       "org.apache.karaf.system.core",
-      { "name": "jsr305", "compile_only": true },
+      { "name": "com_google_code_findbugs_jsr305", "compile_only": true },
       "org.apache.servicemix.bundles.dom4j"
     ],
     "CORE_DEPS": [
@@ -30,7 +30,7 @@
       "easymock",
       "hamcrest-all",
       "hamcrest-optional",
-      "guava-testlib",
+      "com_google_guava_guava_testlib",
       "//utils/junit:onlab-junit"
     ],
     "TEST_ADAPTERS": [
@@ -59,7 +59,7 @@
       "hk2-utils",
       "javax.inject",
       "hk2-osgi-resource-locator",
-      "javax.annotation-api",
+      "javax.annotation-api-mvn",
       "validation-api",
       "//core/common:onos-core-common",
       "//core/api:onos-api-tests",
@@ -67,25 +67,8 @@
       "//utils/osgi:onlab-osgi-tests"
     ],
     "NETTY": [
-      "netty-buffer",
-      "netty-common"
-    ],
-    "GRPC_1.3": [
-      "grpc-protobuf-1.3.1",
-      "grpc-stub-1.3.1",
-      "grpc-netty-1.3.1",
-      "grpc-auth-1.3.1",
-      "grpc-context-1.3.1",
-      "google-truth-0.28"
-    ],
-    "GRPC_TEST_1.3": [
-      "grpc-testing-1.3.1",
-      "grpc-testing-proto-1.3.1",
-      "google-code-findbugs-3.0.0",
-      "google-errorprone-2.0.19",
-      "google-instrumentation-0.3.0",
-      "junit-dep",
-      "objenesis"
+      "io_netty_netty_buffer",
+      "io_netty_netty_common"
     ],
     "ONOS_YANG": [
       "onos-yang-model",
@@ -129,6 +112,25 @@
       "atomix-utils",
       "typesafe-config",
       "classgraph"
+    ],
+
+    // FIXME: Remove this for Bazel build
+    "GRPC_1.3": [
+      "grpc-protobuf-1.3.1",
+      "grpc-stub-1.3.1",
+      "grpc-netty-1.3.1",
+      "grpc-auth-1.3.1",
+      "grpc-context-1.3.1",
+      "google-truth-0.28"
+    ],
+    "GRPC_TEST_1.3": [
+      "grpc-testing-1.3.1",
+      "grpc-testing-proto-1.3.1",
+      "google-code-findbugs-3.0.0",
+      "google-errorprone-2.0.19",
+      "google-instrumentation-0.3.0",
+      "junit-dep",
+      "objenesis"
     ]
   },
 
@@ -164,12 +166,11 @@
     "concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.6.1",
     "easymock": "mvn:org.easymock:easymock:3.6",
     "antlr": "mvn:antlr:antlr:2.7.7",
-    "error_prone_annotations": "mvn:com.google.errorprone:error_prone_annotations:2.0.18",
     "ganymed-ssh2": "mvn:ch.ethz.ganymed:ganymed-ssh2:262",
     "gmetric4j": "mvn:info.ganglia.gmetric4j:gmetric4j:1.0.10",
-    "gson": "mvn:com.google.code.gson:gson:2.7",
-    "guava": "mvn:com.google.guava:guava:22.0",
-    "guava-testlib": "mvn:com.google.guava:guava-testlib:22.0",
+    "com_google_code_gson_gson": "mvn:com.google.code.gson:gson:2.7",
+    "com_google_guava_guava": "mvn:com.google.guava:guava:22.0",
+    "com_google_guava_guava_testlib": "mvn:com.google.guava:guava-testlib:22.0",
     "hamcrest-all": "mvn:org.hamcrest:hamcrest-all:1.3",
     "hk2-api": "mvn:org.glassfish.hk2:hk2-api:2.5.0-b42",
     "hk2-locator": "mvn:org.glassfish.hk2:hk2-locator:2.5.0-b42",
@@ -187,7 +188,11 @@
     "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.9.5",
     "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.9.5",
     "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.9.5",
-    "javax.annotation-api": "mvn:javax.annotation:javax.annotation-api:1.2",
+
+    // Note: grpc imports "javax_annotation_api" has an http file, so we need to give a different name here
+    // See WORKSPACE
+    "javax.annotation-api-mvn": "mvn:javax.annotation:javax.annotation-api:1.2",
+
     "javax.inject": "mvn:org.glassfish.hk2.external:javax.inject:2.5.0-b42",
     "javax.ws.rs-api": "mvn:javax.ws.rs:javax.ws.rs-api:2.1",
     "jersey-client": "mvn:org.glassfish.jersey.core:jersey-client:2.26",
@@ -210,7 +215,7 @@
     "javax.servlet-api": "mvn:javax.servlet:javax.servlet-api:3.1.0",
     "joda-time": "mvn:joda-time:joda-time:2.9.3",
     "jsch": "mvn:com.jcraft:jsch:0.1.53",
-    "jsr305": "mvn:com.google.code.findbugs:jsr305:3.0.1",
+    "com_google_code_findbugs_jsr305": "mvn:com.google.code.findbugs:jsr305:3.0.1",
     "junit": "mvn:junit:junit:4.12",
     "junit-dep": "mvn:junit:junit:4.10",
     "kryo": "mvn:com.esotericsoftware:kryo:4.0.1",
@@ -222,16 +227,19 @@
     "metrics-json": "mvn:io.dropwizard.metrics:metrics-json:3.2.2",
     "minimal-json": "mvn:com.eclipsesource.minimal-json:minimal-json:0.9.4",
     "minlog": "mvn:com.esotericsoftware:minlog:1.3.0",
-    "netty": "mvn:io.netty:netty:3.10.5.Final",
-    "netty-buffer": "mvn:io.netty:netty-buffer:4.1.8.Final",
-    "netty-codec": "mvn:io.netty:netty-codec:4.1.8.Final",
-    "netty-common": "mvn:io.netty:netty-common:4.1.8.Final",
-    "netty-handler": "mvn:io.netty:netty-handler:4.1.8.Final",
-    "netty-transport": "mvn:io.netty:netty-transport:4.1.8.Final",
-    "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.1.8.Final",
-    "netty-resolver": "mvn:io.netty:netty-resolver:4.1.8.Final",
-    "netty-codec-http2": "mvn:io.netty:netty-codec-http2:4.1.8.Final",
-    "netty-codec-http": "mvn:io.netty:netty-codec-http:4.1.8.Final",
+    "io_netty_netty": "mvn:io.netty:netty:3.10.5.Final",
+    "io_netty_netty_buffer": "mvn:io.netty:netty-buffer:4.1.27.Final",
+    "io_netty_netty_codec": "mvn:io.netty:netty-codec:4.1.27.Final",
+    "io_netty_netty_common": "mvn:io.netty:netty-common:4.1.27.Final",
+    "io_netty_netty_handler": "mvn:io.netty:netty-handler:4.1.27.Final",
+    "io_netty_netty_handler_proxy": "mvn:io.netty:netty-handler-proxy:4.1.27.Final",
+    "io_netty_netty_transport": "mvn:io.netty:netty-transport:4.1.27.Final",
+    "io_netty_netty_transport_native_unix_common": "mvn:io.netty:netty-transport-native-unix-common:4.1.27.Final",
+    "io_netty_netty_transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.1.27.Final",
+    "io_netty_netty_resolver": "mvn:io.netty:netty-resolver:4.1.27.Final",
+    "io_netty_netty_codec-http2": "mvn:io.netty:netty-codec-http2:4.1.27.Final",
+    "io_netty_netty_codec-http": "mvn:io.netty:netty-codec-http:4.1.27.Final",
+    "io_netty_netty_codec-socks": "mvn:io.netty:netty-codec-socks:4.1.27.Final",
     "objenesis": "mvn:org.objenesis:objenesis:2.6",
     "openflowj": "mvn:org.onosproject:openflowj:3.2.1.onos",
     "org.apache.felix.framework.security": "mvn:org.onosproject:org.apache.felix.framework.security:jar:2.2.0.onos",
@@ -285,7 +293,6 @@
     "msg-simple": "mvn:com.github.fge:msg-simple:1.1",
     "snakeyaml": "mvn:org.yaml:snakeyaml:1.15",
 
-    // Note update BVER in tools/dev/bin/patch-yang-libs and YANG_VER in tools/build/onos-buck
     "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.5",
     "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.5",
     "onos-yang-compiler-main":"mvn:org.onosproject:onos-yang-compiler-main:2.5",
@@ -293,9 +300,23 @@
     "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.5",
     "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.5",
     "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.5",
+
     "org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
     "plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
     "sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",
+    "bcpkix-jdk15on": "mvn:org.bouncycastle:bcpkix-jdk15on:1.59",
+    "bcprov-jdk15on": "mvn:org.bouncycastle:bcprov-jdk15on:1.59",
+    "hamcrest-optional": "mvn:com.spotify:hamcrest-optional:1.1.0",
+    "swagger-annotations": "mvn:io.swagger:swagger-annotations:1.5.16",
+    "kafka-clients": "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:0.8.2.2_1",
+    "tinder-xmpp": "mvn:org.igniterealtime:tinder:1.3.0",
+    "aalto-xml": "mvn:com.fasterxml:aalto-xml:1.0.0",
+    "stax2-api": "mvn:org.codehaus.woodstox:stax2-api:4.0.0",
+    "concurrent-hashmap": "mvn:com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0",
+    "gnu-idn": "mvn:org.gnu.inet:libidn:1.15",
+    "sigar":"mvn:org.knowhowlab.osgi:sigar:1.6.5_01",
+
+    // FIXME: Remove this for Bazel build...
     "grpc-core-1.3.1": "mvn:io.grpc:grpc-core:1.3.1",
     "grpc-protobuf-1.3.1": "mvn:io.grpc:grpc-protobuf:1.3.1",
     "grpc-protobuf-lite-1.3.1": "mvn:io.grpc:grpc-protobuf-lite:1.3.1",
@@ -310,17 +331,6 @@
     "google-truth-0.28": "mvn:com.google.truth:truth:0.28",
     "google-code-findbugs-3.0.0": "mvn:com.google.code.findbugs:jsr305:3.0.0",
     "google-errorprone-2.0.19": "mvn:com.google.errorprone:error_prone_annotations:2.0.19",
-    "google-instrumentation-0.3.0": "mvn:com.google.instrumentation:instrumentation-api:0.3.0",
-    "bcpkix-jdk15on": "mvn:org.bouncycastle:bcpkix-jdk15on:1.59",
-    "bcprov-jdk15on": "mvn:org.bouncycastle:bcprov-jdk15on:1.59",
-    "hamcrest-optional": "mvn:com.spotify:hamcrest-optional:1.1.0",
-    "swagger-annotations": "mvn:io.swagger:swagger-annotations:1.5.16",
-    "kafka-clients": "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:0.8.2.2_1",
-    "tinder-xmpp": "mvn:org.igniterealtime:tinder:1.3.0",
-    "aalto-xml": "mvn:com.fasterxml:aalto-xml:1.0.0",
-    "stax2-api": "mvn:org.codehaus.woodstox:stax2-api:4.0.0",
-    "concurrent-hashmap": "mvn:com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0",
-    "gnu-idn": "mvn:org.gnu.inet:libidn:1.15",
-    "sigar":"mvn:org.knowhowlab.osgi:sigar:1.6.5_01"
+    "google-instrumentation-0.3.0": "mvn:com.google.instrumentation:instrumentation-api:0.3.0"
   }
 }