diff --git a/lib/BUCK b/lib/BUCK
index 6f354af..fcafdd0 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file is auto-generated at Fri Apr 15 15:25:59 PDT 2016. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri Apr 22 14:55:21 PDT 2016. Do not edit this file manually. *****
 java_library(
   name = 'COMPILE',
   visibility = ['PUBLIC'],
@@ -85,10 +85,10 @@
     ':jersey-container-jetty-http',
     ':jetty-continuation',
     ':jetty-http',
-    ':javax.servlet-api',
     ':jetty-server',
     ':jetty-io',
     ':jetty-util',
+    ':javax.servlet-api',
     ':jersey-guava',
     ':hk2-api',
     ':hk2-locator',
@@ -595,87 +595,17 @@
 )
 
 prebuilt_jar(
-  name = 'jetty-server',
-  binary_jar = ':jetty-server-9.1.6.v20160112.jar',
-  maven_coords = 'org.eclipse.jetty:jetty-server:9.1.6.v20160112',
+  name = 'jersey-container-jetty-http',
+  binary_jar = ':jersey-container-jetty-http-2.22.2.jar',
+  maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_file(
-  name = 'jetty-server-9.1.6.v20160112.jar',
-  out = 'jetty-server-9.1.6.v20160112.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-server:jar:9.1.6.v20160112',
-  sha1 = '15f8b12fe0e2105f46d7c3b372054adc85e941a9',
-)
-
-prebuilt_jar(
-  name = 'jetty-util',
-  binary_jar = ':jetty-util-9.1.6.v20160112.jar',
-  maven_coords = 'org.eclipse.jetty:jetty-util:9.1.6.v20160112',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_file(
-  name = 'jetty-util-9.1.6.v20160112.jar',
-  out = 'jetty-util-9.1.6.v20160112.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-util:jar:9.1.6.v20160112',
-  sha1 = 'd4337bc023fe99b072abc56425b8a317ffd3f462',
-)
-
-prebuilt_jar(
-  name = 'jetty-continuation',
-  binary_jar = ':jetty-continuation-9.1.6.v20160112.jar',
-  maven_coords = 'org.eclipse.jetty:jetty-continuation:9.1.6.v20160112',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_file(
-  name = 'jetty-continuation-9.1.6.v20160112.jar',
-  out = 'jetty-continuation-9.1.6.v20160112.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-continuation:jar:9.1.6.v20160112',
-  sha1 = 'c8f35dfc6321cc15224404c9c4ede79988eeae34',
-)
-
-prebuilt_jar(
-  name = 'jetty-http',
-  binary_jar = ':jetty-http-9.1.6.v20160112.jar',
-  maven_coords = 'org.eclipse.jetty:jetty-http:9.1.6.v20160112',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_file(
-  name = 'jetty-http-9.1.6.v20160112.jar',
-  out = 'jetty-http-9.1.6.v20160112.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-http:jar:9.1.6.v20160112',
-  sha1 = 'c3675e6ebc350aafbc9dd7686265af9f65165b36',
-)
-
-prebuilt_jar(
-  name = 'jetty-io',
-  binary_jar = ':jetty-io-9.1.6.v20160112.jar',
-  maven_coords = 'org.eclipse.jetty:jetty-io:9.1.6.v20160112',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_file(
-  name = 'jetty-io-9.1.6.v20160112.jar',
-  out = 'jetty-io-9.1.6.v20160112.jar',
-  url = 'mvn:org.eclipse.jetty:jetty-io:jar:9.1.6.v20160112',
-  sha1 = '717fc5a269becb2537849105de1547dc1a4476b0',
-)
-
-prebuilt_jar(
-  name = 'javax.servlet-api',
-  binary_jar = ':javax.servlet-api-3.1.0.jar',
-  maven_coords = 'javax.servlet:javax.servlet-api:3.1.0',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_file(
-  name = 'javax.servlet-api-3.1.0.jar',
-  out = 'javax.servlet-api-3.1.0.jar',
-  url = 'mvn:javax.servlet:javax.servlet-api:jar:3.1.0',
-  sha1 = '3cd63d075497751784b2fa84be59432f4905bf7c',
+  name = 'jersey-container-jetty-http-2.22.2.jar',
+  out = 'jersey-container-jetty-http-2.22.2.jar',
+  url = 'mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:jar:2.22.2',
+  sha1 = '7421abf505bda989087745a458b5ccf2cd327297',
 )
 
 prebuilt_jar(
@@ -959,20 +889,6 @@
 )
 
 prebuilt_jar(
-  name = 'jersey-container-jetty-http',
-  binary_jar = ':jersey-container-jetty-http-2.22.2.jar',
-  maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_file(
-  name = 'jersey-container-jetty-http-2.22.2.jar',
-  out = 'jersey-container-jetty-http-2.22.2.jar',
-  url = 'mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:jar:2.22.2',
-  sha1 = '7421abf505bda989087745a458b5ccf2cd327297',
-)
-
-prebuilt_jar(
   name = 'jersey-guava',
   binary_jar = ':jersey-guava-2.22.2.jar',
   maven_coords = 'org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2',
@@ -1043,6 +959,20 @@
 )
 
 prebuilt_jar(
+  name = 'jetty-util',
+  binary_jar = ':jetty-util-9.1.6.v20160112.jar',
+  maven_coords = 'org.eclipse.jetty:jetty-util:9.1.6.v20160112',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_file(
+  name = 'jetty-util-9.1.6.v20160112.jar',
+  out = 'jetty-util-9.1.6.v20160112.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-util:jar:9.1.6.v20160112',
+  sha1 = 'd4337bc023fe99b072abc56425b8a317ffd3f462',
+)
+
+prebuilt_jar(
   name = 'jetty-websocket',
   binary_jar = ':jetty-websocket-8.1.18.v20150929.jar',
   maven_coords = 'org.eclipse.jetty:jetty-websocket:8.1.18.v20150929',
@@ -1057,6 +987,76 @@
 )
 
 prebuilt_jar(
+  name = 'jetty-server',
+  binary_jar = ':jetty-server-9.1.6.v20160112.jar',
+  maven_coords = 'org.eclipse.jetty:jetty-server:9.1.6.v20160112',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_file(
+  name = 'jetty-server-9.1.6.v20160112.jar',
+  out = 'jetty-server-9.1.6.v20160112.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-server:jar:9.1.6.v20160112',
+  sha1 = '15f8b12fe0e2105f46d7c3b372054adc85e941a9',
+)
+
+prebuilt_jar(
+  name = 'jetty-continuation',
+  binary_jar = ':jetty-continuation-9.1.6.v20160112.jar',
+  maven_coords = 'org.eclipse.jetty:jetty-continuation:9.1.6.v20160112',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_file(
+  name = 'jetty-continuation-9.1.6.v20160112.jar',
+  out = 'jetty-continuation-9.1.6.v20160112.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-continuation:jar:9.1.6.v20160112',
+  sha1 = 'c8f35dfc6321cc15224404c9c4ede79988eeae34',
+)
+
+prebuilt_jar(
+  name = 'jetty-http',
+  binary_jar = ':jetty-http-9.1.6.v20160112.jar',
+  maven_coords = 'org.eclipse.jetty:jetty-http:9.1.6.v20160112',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_file(
+  name = 'jetty-http-9.1.6.v20160112.jar',
+  out = 'jetty-http-9.1.6.v20160112.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-http:jar:9.1.6.v20160112',
+  sha1 = 'c3675e6ebc350aafbc9dd7686265af9f65165b36',
+)
+
+prebuilt_jar(
+  name = 'jetty-io',
+  binary_jar = ':jetty-io-9.1.6.v20160112.jar',
+  maven_coords = 'org.eclipse.jetty:jetty-io:9.1.6.v20160112',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_file(
+  name = 'jetty-io-9.1.6.v20160112.jar',
+  out = 'jetty-io-9.1.6.v20160112.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-io:jar:9.1.6.v20160112',
+  sha1 = '717fc5a269becb2537849105de1547dc1a4476b0',
+)
+
+prebuilt_jar(
+  name = 'javax.servlet-api',
+  binary_jar = ':javax.servlet-api-3.1.0.jar',
+  maven_coords = 'javax.servlet:javax.servlet-api:3.1.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_file(
+  name = 'javax.servlet-api-3.1.0.jar',
+  out = 'javax.servlet-api-3.1.0.jar',
+  url = 'mvn:javax.servlet:javax.servlet-api:jar:3.1.0',
+  sha1 = '3cd63d075497751784b2fa84be59432f4905bf7c',
+)
+
+prebuilt_jar(
   name = 'joda-time',
   binary_jar = ':joda-time-2.9.jar',
   maven_coords = 'joda-time:joda-time:2.9',
@@ -1352,16 +1352,15 @@
 
 prebuilt_jar(
   name = 'openflowj',
-  binary_jar = ':openflowj-0.9.2.onos.jar',
-  maven_coords = 'org.onosproject:openflowj:0.9.2.onos',
+  binary_jar = ':openflowj-0.9.3.onos-20160405.002022-1.jar',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_file(
-  name = 'openflowj-0.9.2.onos.jar',
-  out = 'openflowj-0.9.2.onos.jar',
-  url = 'mvn:org.onosproject:openflowj:jar:0.9.2.onos',
-  sha1 = '7cd6a35f6638f8ee3f5415484842bf95a4e619db',
+  name = 'openflowj-0.9.3.onos-20160405.002022-1.jar',
+  out = 'openflowj-0.9.3.onos-20160405.002022-1.jar',
+  url = 'https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/openflowj/0.9.3.onos-SNAPSHOT/openflowj-0.9.3.onos-20160405.002022-1.jar',
+  sha1 = '2e64722ac68e6bfe6a1cbfbf79bbe023b99c6a2e',
 )
 
 prebuilt_jar(
diff --git a/lib/deps.json b/lib/deps.json
index 7893c35..59a400d 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -173,7 +173,10 @@
     "netty-transport": "mvn:io.netty:netty-transport:4.0.33.Final",
     "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.0.33.Final",
     "objenesis": "mvn:org.objenesis:objenesis:2.2",
-    "openflowj": "mvn:org.onosproject:openflowj:0.9.2.onos",
+    "openflowj": {
+      "uri": "mvn:org.onosproject:openflowj:0.9.3.onos-SNAPSHOT",
+      "repo": "https://oss.sonatype.org/content/repositories/snapshots"
+    },
     "org.apache.felix.scr": "mvn:org.apache.felix:org.apache.felix.scr:1.8.2",
     "org.apache.felix.scr.annotations": "mvn:org.apache.felix:org.apache.felix.scr.annotations:1.9.12",
     "org.apache.karaf.features.core": "mvn:org.apache.karaf.features:org.apache.karaf.features.core:3.0.5",