diff --git a/lib/BUCK b/lib/BUCK
index afd8b09..1cb3d2d 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Tue Aug 16 15:39:29 PDT 2016. Do not edit this file manually. *****
+# ***** This file was auto-generated at Tue Sep 13 16:22:03 PDT 2016. Do not edit this file manually. *****
 osgi_feature_group(
   name = 'COMPILE',
   visibility = ['PUBLIC'],
@@ -33,8 +33,6 @@
     ':org.apache.karaf.features.core',
     ':org.apache.karaf.system.core',
     ':jsr305',
-    ':amqp-client',
-    ':gson',
   ],
 )
 
@@ -107,15 +105,6 @@
 )
 
 remote_jar (
-  name = 'gmetric4j',
-  out = 'gmetric4j-1.0.10.jar',
-  url = 'mvn:info.ganglia.gmetric4j:gmetric4j:jar:1.0.10',
-  sha1 = '3d62003123b586adb86cb028cc0f8a8c3a701d81',
-  maven_coords = 'info.ganglia.gmetric4j:gmetric4j:1.0.10',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
   name = 'aopalliance-repackaged',
   out = 'aopalliance-repackaged-2.4.0-b34.jar',
   url = 'mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.4.0-b34',
@@ -125,6 +114,15 @@
 )
 
 remote_jar (
+  name = 'amqp-client',
+  out = 'amqp-client-3.6.1.jar',
+  url = 'mvn:com.rabbitmq:amqp-client:jar:3.6.1',
+  sha1 = '089be4acfa8a0fa48a775a82d20632f90aecf10b',
+  maven_coords = 'com.rabbitmq:amqp-client:3.6.1',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'asm',
   out = 'asm-5.0.4.jar',
   url = 'mvn:org.ow2.asm:asm:jar:5.0.4',
@@ -234,10 +232,10 @@
 
 remote_jar (
   name = 'concurrent-trees',
-  out = 'concurrent-trees-2.4.0.jar',
-  url = 'mvn:com.googlecode.concurrent-trees:concurrent-trees:jar:2.4.0',
-  sha1 = '2e505b78f9216abebbbdf1c3254bf9f4c565ae43',
-  maven_coords = 'com.googlecode.concurrent-trees:concurrent-trees:jar:NON-OSGI:2.4.0',
+  out = 'concurrent-trees-2.6.0.jar',
+  url = 'mvn:com.googlecode.concurrent-trees:concurrent-trees:jar:2.6.0',
+  sha1 = '3d120cafe57cd8d487e168db334487b00a7707b2',
+  maven_coords = 'com.googlecode.concurrent-trees:concurrent-trees:2.6.0',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -278,29 +276,20 @@
 )
 
 remote_jar (
-  name = 'jersey-container-jetty-http',
-  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',
-  maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2',
+  name = 'gmetric4j',
+  out = 'gmetric4j-1.0.10.jar',
+  url = 'mvn:info.ganglia.gmetric4j:gmetric4j:jar:1.0.10',
+  sha1 = '3d62003123b586adb86cb028cc0f8a8c3a701d81',
+  maven_coords = 'info.ganglia.gmetric4j:gmetric4j:1.0.10',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
-  name = 'jersey-container-servlet',
-  out = 'jersey-container-servlet-2.22.2.jar',
-  url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet:jar:2.22.2',
-  sha1 = 'd90487b9809f822af7731abb8896a2183e7c4a0c',
-  maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet:2.22.2',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'jersey-container-servlet-core',
-  out = 'jersey-container-servlet-core-2.22.2.jar',
-  url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.22.2',
-  sha1 = '212c534c5b030594ccf5c4b929e8f7cbf26eb1ba',
-  maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2',
+  name = 'gson',
+  out = 'gson-2.6.2.jar',
+  url = 'mvn:com.google.code.gson:gson:jar:2.6.2',
+  sha1 = 'f1bc476cc167b18e66c297df599b2377131a8947',
+  maven_coords = 'com.google.code.gson:gson:2.6.2',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -485,6 +474,33 @@
 )
 
 remote_jar (
+  name = 'jersey-container-jetty-http',
+  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',
+  maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'jersey-container-servlet',
+  out = 'jersey-container-servlet-2.22.2.jar',
+  url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet:jar:2.22.2',
+  sha1 = 'd90487b9809f822af7731abb8896a2183e7c4a0c',
+  maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet:2.22.2',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'jersey-container-servlet-core',
+  out = 'jersey-container-servlet-core-2.22.2.jar',
+  url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.22.2',
+  sha1 = '212c534c5b030594ccf5c4b929e8f7cbf26eb1ba',
+  maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'jersey-guava',
   out = 'jersey-guava-2.22.2.jar',
   url = 'mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.22.2',
@@ -1104,21 +1120,3 @@
   visibility = [ 'PUBLIC' ],
 )
 
-remote_jar (
-  name = 'amqp-client',
-  out = 'amqp-client-3.6.1.jar',
-  url = 'mvn:com.rabbitmq:amqp-client:jar:3.6.1',
-  sha1 = '089be4acfa8a0fa48a775a82d20632f90aecf10b',
-  maven_coords = 'com.rabbitmq:amqp-client:3.6.1',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'gson',
-  out = 'gson-2.6.2.jar',
-  url = 'mvn:com.google.code.gson:gson:jar:2.6.2',
-  sha1 = 'f1bc476cc167b18e66c297df599b2377131a8947',
-  maven_coords = 'com.google.code.gson:gson:2.6.2',
-  visibility = [ 'PUBLIC' ],
-)
-
diff --git a/lib/deps.json b/lib/deps.json
index fec42a8..8d10606 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -23,7 +23,7 @@
       "slf4j-api",
       "osgi-core",
       "org.osgi.compendium",
-      "org.apache.felix.scr.annotations",
+      { "name": "org.apache.felix.scr.annotations", "compile_only": true },
       "org.apache.felix.scr",
       "jackson-annotations",
       "jackson-core",
@@ -83,8 +83,8 @@
   },
 
   "artifacts": {
-    "gmetric4j": "mvn:info.ganglia.gmetric4j:gmetric4j:1.0.10",
     "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34",
+    "amqp-client": "mvn:com.rabbitmq:amqp-client:jar:3.6.1",
     "asm": "mvn:org.ow2.asm:asm:5.0.4",
     "atomix": "mvn:io.atomix:atomix-all:1.0.0-rc9",
     "commons-codec": "mvn:commons-codec:commons-codec:1.10",
@@ -97,14 +97,13 @@
     "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",
+    "concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.6.0",
     "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",
-    "jersey-container-servlet": "mvn:org.glassfish.jersey.containers:jersey-container-servlet:2.22.2",
-    "jersey-container-servlet-core": "mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2",
+    "gmetric4j": "mvn:info.ganglia.gmetric4j:gmetric4j:1.0.10",
+    "gson": "mvn:com.google.code.gson:gson:jar:2.6.2",
     "guava": "mvn:com.google.guava:guava:19.0",
     "guava-testlib": "mvn:com.google.guava:guava-testlib:19.0",
     "hamcrest-all": "mvn:org.hamcrest:hamcrest-all:1.3",
@@ -125,6 +124,9 @@
     "javax.ws.rs-api": "mvn:javax.ws.rs:javax.ws.rs-api:2.0.1",
     "jersey-client": "mvn:org.glassfish.jersey.core:jersey-client:2.22.2",
     "jersey-common": "mvn:org.glassfish.jersey.core:jersey-common:2.22.2",
+    "jersey-container-jetty-http": "mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2",
+    "jersey-container-servlet": "mvn:org.glassfish.jersey.containers:jersey-container-servlet:2.22.2",
+    "jersey-container-servlet-core": "mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2",
     "jersey-guava": "mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2",
     "jersey-media-multipart": "mvn:org.glassfish.jersey.media:jersey-media-multipart:2.22.2",
     "jersey-server": "mvn:org.glassfish.jersey.core:jersey-server:2.22.2",