diff --git a/lib/BUCK b/lib/BUCK
index db38e47..1103cfe 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed May 18 14:26:50 PDT 2016. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed May 18 17:55:44 PDT 2016. Do not edit this file manually. *****
 osgi_feature_group(
   name = 'COMPILE',
   visibility = ['PUBLIC'],
@@ -321,6 +321,15 @@
 )
 
 remote_jar (
+  name = 'commons-beanutils',
+  out = 'commons-beanutils-1.9.2.jar',
+  url = 'mvn:commons-beanutils:commons-beanutils:jar:1.9.2',
+  sha1 = '7a87d845ad3a155297e8f67d9008f4c1e5656b71',
+  maven_coords = 'commons-beanutils:commons-beanutils:1.9.2',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'concurrent-trees',
   out = 'concurrent-trees-2.4.0.jar',
   url = 'mvn:com.googlecode.concurrent-trees:concurrent-trees:jar:2.4.0',
@@ -420,6 +429,15 @@
 )
 
 remote_jar (
+  name = 'antlr',
+  out = 'antlr-2.7.7.jar',
+  url = 'mvn:antlr:antlr:jar:2.7.7',
+  sha1 = '83cd2cd674a217ade95a4bb83a8a14f351f48bd0',
+  maven_coords = 'antlr:antlr:jar:NON-OSGI:2.7.7',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'error_prone_annotations',
   out = 'error_prone_annotations-2.0.2.jar',
   url = 'mvn:com.google.errorprone:error_prone_annotations:jar:2.0.2',
@@ -1114,9 +1132,10 @@
 
 remote_jar (
   name = 'checkstyle',
-  out = 'checkstyle-6.11.2-all.jar',
-  url = 'http://onlab.vicci.org/onos/third-party/checkstyle-6.11.2-all.jar',
-  sha1 = 'f504187b1743e73ffe72c2eede0ff57d45536b7d',
+  out = 'checkstyle-6.11.2.jar',
+  url = 'mvn:com.puppycrawl.tools:checkstyle:jar:6.11.2',
+  sha1 = '2705f014697ac0219de0bb2bfc33afb7ec6d22c6',
+  maven_coords = 'com.puppycrawl.tools:checkstyle:jar:NON-OSGI:6.11.2',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index 62ea79c..d25082f 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -98,6 +98,7 @@
     "catalyst-local": "mvn:io.atomix.catalyst:catalyst-local:1.0.4",
     "catalyst-serializer": "mvn:io.atomix.catalyst:catalyst-serializer:1.0.4",
     "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.0.4",
+    "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.0.4",
     "commons-codec": "mvn:commons-codec:commons-codec:1.10",
     "commons-collections": "mvn:commons-collections:commons-collections:3.2.2",
     "commons-configuration": "mvn:commons-configuration:commons-configuration:1.10",
@@ -107,6 +108,7 @@
     "commons-logging": "mvn:commons-logging:commons-logging:1.1.1",
     "commons-math3": "mvn:org.apache.commons:commons-math3:3.6.1",
     "commons-pool": "mvn:commons-pool:commons-pool:1.6",
+    "commons-beanutils": "mvn:commons-beanutils:commons-beanutils:1.9.2",
     "concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.4.0",
     "copycat-api": "mvn:org.onosproject:copycat-api:0.5.1.onos",
     "copycat-client": "mvn:io.atomix.copycat:copycat-client:1.0.0-rc4",
@@ -118,6 +120,7 @@
     "copycat-state-log": "mvn:org.onosproject:copycat-state-log:0.5.1.onos",
     "copycat-state-machine": "mvn:org.onosproject:copycat-state-machine:0.5.1.onos",
     "easymock": "mvn:org.easymock:easymock:3.4",
+    "antlr": "mvn:antlr:antlr:2.7.7",
     "error_prone_annotations": "mvn:com.google.errorprone:error_prone_annotations:2.0.2",
     "ganymed-ssh2": "mvn:ch.ethz.ganymed:ganymed-ssh2:262",
     "jersey-container-jetty-http": "mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2",
@@ -198,7 +201,7 @@
     "slf4j-jdk14": "mvn:org.slf4j:slf4j-jdk14:1.7.21",
     "typesafe-config": "mvn:com.typesafe:config:1.2.1",
     "validation-api": "mvn:javax.validation:validation-api:1.1.0.Final",
-    "checkstyle": "http://onlab.vicci.org/onos/third-party/checkstyle-6.11.2-all.jar",
+    "checkstyle": "mvn:com.puppycrawl.tools:checkstyle:6.11.2",
     "apache-karaf": "http://onlab.vicci.org/onos/third-party/apache-karaf-3.0.5.tar.gz",
     "bndlib": "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:3.1.0",
     "org.apache.felix.scr.bnd": {