diff --git a/lib/BUCK b/lib/BUCK
index e89fa92..119fe4b 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 10 Sep 2018 20:11:15 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Tue, 18 Sep 2018 20:31:36 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -22,9 +22,9 @@
     ':com_google_guava_guava',
     ':slf4j-api',
     ':osgi-core',
-    ':org.osgi.compendium',
-    ':org.apache.felix.scr.annotations',
-    ':org.apache.felix.scr',
+    ':org.osgi.service.component',
+    ':org.osgi.service.component.annotations',
+    ':org.osgi.service.metatype.annotations',
     ':org.apache.karaf.features.core',
     ':org.apache.karaf.system.core',
     ':com_google_code_findbugs_jsr305',
@@ -233,10 +233,10 @@
 
 remote_jar (
   name = 'asm',
-  out = 'asm-5.0.4.jar',
-  url = 'mvn:org.ow2.asm:asm:jar:5.0.4',
-  sha1 = '0da08b8cce7bbf903602a25a3a163ae252435795',
-  maven_coords = 'org.ow2.asm:asm:5.0.4',
+  out = 'asm-6.2.jar',
+  url = 'mvn:org.ow2.asm:asm:jar:6.2',
+  sha1 = '1b6c4ff09ce03f3052429139c2a68e295cae6604',
+  maven_coords = 'org.ow2.asm:asm:6.2',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -367,15 +367,6 @@
 )
 
 remote_jar (
-  name = 'commons-jxpath',
-  out = 'commons-jxpath-1.3.jar',
-  url = 'mvn:commons-jxpath:commons-jxpath:jar:1.3',
-  sha1 = 'c22d7d0f0f40eb7059a23cfa61773a416768b137',
-  maven_coords = 'commons-jxpath:commons-jxpath:1.3',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
   name = 'commons-beanutils',
   out = 'commons-beanutils-1.9.3.jar',
   url = 'mvn:commons-beanutils:commons-beanutils:jar:1.9.3',
@@ -827,55 +818,55 @@
 
 remote_jar (
   name = 'jetty-util',
-  out = 'jetty-util-9.2.21.v20170120.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-util:jar:9.2.21.v20170120',
-  sha1 = '58d9c3a134dc6d6d84b555758015ab3585b88464',
-  maven_coords = 'org.eclipse.jetty:jetty-util:9.2.21.v20170120',
+  out = 'jetty-util-9.4.11.v20180605.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-util:jar:9.4.11.v20180605',
+  sha1 = 'f0f25aa2f27d618a04bc7356fa247ae4a05245b3',
+  maven_coords = 'org.eclipse.jetty:jetty-util:9.4.11.v20180605',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'jetty-websocket',
-  out = 'jetty-websocket-8.1.19.v20160209.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-websocket:jar:8.1.19.v20160209',
-  sha1 = 'a423ddda13e52a65d604320472af598ca7122a60',
-  maven_coords = 'org.eclipse.jetty:jetty-websocket:8.1.19.v20160209',
+  out = 'websocket-servlet-9.4.11.v20180605.jar',
+  url = 'mvn:org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.11.v20180605',
+  sha1 = '0ba53ba5f749d22ddb87331161c214a21b8aa6c8',
+  maven_coords = 'org.eclipse.jetty.websocket:websocket-servlet:9.4.11.v20180605',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'jetty-server',
-  out = 'jetty-server-9.2.21.v20170120.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-server:jar:9.2.21.v20170120',
-  sha1 = 'bdf6a2d58f878652e4b8c3af913e9c56b995e87d',
-  maven_coords = 'org.eclipse.jetty:jetty-server:9.2.21.v20170120',
+  out = 'jetty-server-9.4.11.v20180605.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-server:jar:9.4.11.v20180605',
+  sha1 = '58353c2f27515b007fc83ae22002feb34fc24714',
+  maven_coords = 'org.eclipse.jetty:jetty-server:9.4.11.v20180605',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'jetty-continuation',
-  out = 'jetty-continuation-9.2.21.v20170120.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-continuation:jar:9.2.21.v20170120',
-  sha1 = '38c35ef850d508aa0fae450eee72d784a5dd2d06',
-  maven_coords = 'org.eclipse.jetty:jetty-continuation:9.2.21.v20170120',
+  out = 'jetty-continuation-9.4.11.v20180605.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-continuation:jar:9.4.11.v20180605',
+  sha1 = '31f1e347d013356317164b86bbbc2a6ce5c5e871',
+  maven_coords = 'org.eclipse.jetty:jetty-continuation:9.4.11.v20180605',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'jetty-http',
-  out = 'jetty-http-9.2.21.v20170120.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-http:jar:9.2.21.v20170120',
-  sha1 = '24c5a91c48cfd73b863962ec36ba4dc2bb6552ea',
-  maven_coords = 'org.eclipse.jetty:jetty-http:9.2.21.v20170120',
+  out = 'jetty-http-9.4.11.v20180605.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-http:jar:9.4.11.v20180605',
+  sha1 = '20c35f5336befe35b0bd5c4a63e07170fe7872d7',
+  maven_coords = 'org.eclipse.jetty:jetty-http:9.4.11.v20180605',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'jetty-io',
-  out = 'jetty-io-9.2.21.v20170120.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-io:jar:9.2.21.v20170120',
-  sha1 = 'a25222b557823b59a7b6d121f951926be20cff85',
-  maven_coords = 'org.eclipse.jetty:jetty-io:9.2.21.v20170120',
+  out = 'jetty-io-9.4.11.v20180605.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-io:jar:9.4.11.v20180605',
+  sha1 = 'd164de1dac18c4ca80a1b783d879c97449909c3b',
+  maven_coords = 'org.eclipse.jetty:jetty-io:9.4.11.v20180605',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -1150,47 +1141,65 @@
 )
 
 remote_jar (
-  name = 'org.apache.felix.framework.security',
-  out = 'org.apache.felix.framework.security-2.2.0.onos.jar',
-  url = 'mvn:org.onosproject:org.apache.felix.framework.security:jar:2.2.0.onos',
-  sha1 = '5d39a4ff4a5d3daec8c404789d398c780151de8c',
-  maven_coords = 'org.onosproject:org.apache.felix.framework.security:2.2.0.onos',
+  name = 'org.osgi.service.component',
+  out = 'org.osgi.service.component-1.4.0.jar',
+  url = 'mvn:org.osgi:org.osgi.service.component:jar:1.4.0',
+  sha1 = '4934dce3e552c172283a4962929c39f9075f4393',
+  maven_coords = 'org.osgi:org.osgi.service.component:1.4.0',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'org.apache.felix.scr',
-  out = 'org.apache.felix.scr-1.8.2.jar',
-  url = 'mvn:org.apache.felix:org.apache.felix.scr:jar:1.8.2',
-  sha1 = 'c3047d56ee57de0752821fd9c3894dda664f2e37',
-  maven_coords = 'org.apache.felix:org.apache.felix.scr:1.8.2',
+  name = 'org.osgi.service.component.annotations',
+  out = 'org.osgi.service.component.annotations-1.4.0.jar',
+  url = 'mvn:org.osgi:org.osgi.service.component.annotations:jar:1.4.0',
+  sha1 = '18380195e7e657494471cf4cabcafb762f63c9a8',
+  maven_coords = 'org.osgi:org.osgi.service.component.annotations:1.4.0',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'org.apache.felix.scr.annotations',
-  out = 'org.apache.felix.scr.annotations-1.9.12.jar',
-  url = 'mvn:org.apache.felix:org.apache.felix.scr.annotations:jar:1.9.12',
-  sha1 = '5fdc34da641dda8b9165c2be93211479a186da9c',
-  maven_coords = 'org.apache.felix:org.apache.felix.scr.annotations:jar:NON-OSGI:1.9.12',
+  name = 'org.osgi.service.metatype.annotations',
+  out = 'org.osgi.service.metatype.annotations-1.4.0.jar',
+  url = 'mvn:org.osgi:org.osgi.service.metatype.annotations:jar:1.4.0',
+  sha1 = '5475175092f41ff663deea11a31c8229102574c7',
+  maven_coords = 'org.osgi:org.osgi.service.metatype.annotations:1.4.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'org.osgi.service.cm',
+  out = 'org.osgi.service.cm-1.6.0.jar',
+  url = 'mvn:org.osgi:org.osgi.service.cm:jar:1.6.0',
+  sha1 = 'f0c01d6da3799107b17f894ae7920cfd6fa69da6',
+  maven_coords = 'org.osgi:org.osgi.service.cm:1.6.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'org.apache.felix.scr.bnd',
+  out = 'org.apache.felix.scr.bnd-1.9.0.jar',
+  url = 'mvn:org.apache.felix:org.apache.felix.scr.bnd:jar:1.9.0',
+  sha1 = '44354d132f8ce9fc387caf05c9189c4102828a9b',
+  maven_coords = 'org.apache.felix:org.apache.felix.scr.bnd:jar:NON-OSGI:1.9.0',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'org.apache.karaf.features.core',
-  out = 'org.apache.karaf.features.core-3.0.8.jar',
-  url = 'mvn:org.apache.karaf.features:org.apache.karaf.features.core:jar:3.0.8',
-  sha1 = '4a8bf5dbe10e120158cb69295388274f834ae37a',
-  maven_coords = 'org.apache.karaf.features:org.apache.karaf.features.core:3.0.8',
+  out = 'org.apache.karaf.features.core-4.2.1.jar',
+  url = 'mvn:org.apache.karaf.features:org.apache.karaf.features.core:jar:4.2.1',
+  sha1 = '329aa987b142470f9f5ddda98a9621ecfbfafedd',
+  maven_coords = 'org.apache.karaf.features:org.apache.karaf.features.core:4.2.1',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'org.apache.karaf.shell.console',
-  out = 'org.apache.karaf.shell.console-3.0.8.jar',
-  url = 'mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:jar:3.0.8',
-  sha1 = '5bf3e409d2e73bef560face9740b8c1234909b83',
-  maven_coords = 'org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.8',
+  out = 'org.apache.karaf.shell.console-4.2.1.jar',
+  url = 'mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:jar:4.2.1',
+  sha1 = '9e494eed7a1e46a582e919ab553e0b427b82fa77',
+  maven_coords = 'org.apache.karaf.shell:org.apache.karaf.shell.console:4.2.1',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -1214,19 +1223,19 @@
 
 remote_jar (
   name = 'org.apache.karaf.jaas',
-  out = 'org.apache.karaf.jaas.modules-3.0.8.jar',
-  url = 'mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:jar:3.0.8',
-  sha1 = 'e4c97dac488898af1dda2b2cbf5b66318339cd29',
-  maven_coords = 'org.apache.karaf.jaas:org.apache.karaf.jaas.modules:3.0.8',
+  out = 'org.apache.karaf.jaas.modules-4.2.1.jar',
+  url = 'mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:jar:4.2.1',
+  sha1 = 'aff0989e2af701a2294779a7aedd2df689418fa7',
+  maven_coords = 'org.apache.karaf.jaas:org.apache.karaf.jaas.modules:4.2.1',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'org.apache.karaf.system.core',
-  out = 'org.apache.karaf.system.core-3.0.8.jar',
-  url = 'mvn:org.apache.karaf.system:org.apache.karaf.system.core:jar:3.0.8',
-  sha1 = '80378de4aeae603889d3408489ff5b9918e6064c',
-  maven_coords = 'org.apache.karaf.system:org.apache.karaf.system.core:3.0.8',
+  out = 'org.apache.karaf.system.core-4.2.1.jar',
+  url = 'mvn:org.apache.karaf.system:org.apache.karaf.system.core:jar:4.2.1',
+  sha1 = '31fdda53480b358b7b8cd16e7c96d7de978467ef',
+  maven_coords = 'org.apache.karaf.system:org.apache.karaf.system.core:4.2.1',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -1249,6 +1258,15 @@
 )
 
 remote_jar (
+  name = 'org.osgi.cmpn',
+  out = 'osgi.cmpn-7.0.0.jar',
+  url = 'mvn:org.osgi:osgi.cmpn:jar:7.0.0',
+  sha1 = '4fa9f239a60aeca4a27648df329d112d562a350c',
+  maven_coords = 'org.osgi:osgi.cmpn:7.0.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'osgi-core',
   out = 'org.osgi.core-5.0.0.jar',
   url = 'mvn:org.osgi:org.osgi.core:jar:5.0.0',
@@ -1259,10 +1277,10 @@
 
 remote_jar (
   name = 'reflectasm',
-  out = 'reflectasm-1.11.0.jar',
-  url = 'mvn:com.esotericsoftware:reflectasm:jar:1.11.0',
-  sha1 = 'f747d8b017a26bac575f8da14e8c1df6aecd3154',
-  maven_coords = 'com.esotericsoftware:reflectasm:1.11.0',
+  out = 'reflectasm-1.11.7.jar',
+  url = 'mvn:com.esotericsoftware:reflectasm:jar:1.11.7',
+  sha1 = '572a41b00181e9dd49e327675948b1d6301f9d48',
+  maven_coords = 'com.esotericsoftware:reflectasm:1.11.7',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -1418,15 +1436,6 @@
 )
 
 remote_jar (
-  name = 'org.apache.felix.scr.bnd',
-  out = 'org.apache.felix.scr.bnd-1.4.1-20160328.235003-2.jar',
-  url = 'https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/org.apache.felix.scr.bnd/1.4.1-SNAPSHOT/org.apache.felix.scr.bnd-1.4.1-20160328.235003-2.jar',
-  sha1 = '607cac6eaba5b0eb0787a343b83fe535c42c09aa',
-  maven_coords = 'org.onosproject:org.apache.felix.scr.bnd:1.4.1-SNAPSHOT',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
   name = 'snmp-core',
   out = 'snmp-core-1.3-20161021.1.jar',
   url = 'mvn:org.onosproject:snmp-core:jar:1.3-20161021.1',