diff --git a/features/features.xml b/features/features.xml
index cd61f80..a9eeeca 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -23,7 +23,7 @@
         <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
         <bundle>mvn:org.apache.commons/commons-lang3/3.5</bundle>
         <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
-        <bundle>mvn:com.google.guava/guava/21.0</bundle>
+        <bundle>mvn:com.google.guava/guava/22.0</bundle>
         <bundle>mvn:io.netty/netty/3.10.5.Final</bundle>
         <bundle>mvn:io.netty/netty-common/4.1.5.Final</bundle>
         <bundle>mvn:io.netty/netty-buffer/4.1.5.Final</bundle>
diff --git a/lib/BUCK b/lib/BUCK
index 7b539c0..5fa76c3 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 22 May 2017 16:42:17 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Tue, 23 May 2017 18:42:38 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -312,19 +312,19 @@
 
 remote_jar (
   name = 'guava',
-  out = 'guava-21.0.jar',
-  url = 'mvn:com.google.guava:guava:jar:21.0',
-  sha1 = '3a3d111be1be1b745edfa7d91678a12d7ed38709',
-  maven_coords = 'com.google.guava:guava:21.0',
+  out = 'guava-22.0.jar',
+  url = 'mvn:com.google.guava:guava:jar:22.0',
+  sha1 = '3564ef3803de51fb0530a8377ec6100b33b0d073',
+  maven_coords = 'com.google.guava:guava:22.0',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'guava-testlib',
-  out = 'guava-testlib-21.0.jar',
-  url = 'mvn:com.google.guava:guava-testlib:jar:21.0',
-  sha1 = '1ec77c45666cf17da76cd80725194148a8ffc440',
-  maven_coords = 'com.google.guava:guava-testlib:jar:NON-OSGI:21.0',
+  out = 'guava-testlib-22.0.jar',
+  url = 'mvn:com.google.guava:guava-testlib:jar:22.0',
+  sha1 = '3be1b88f1cfc6592acbcbfe1f3a420f79eb2b146',
+  maven_coords = 'com.google.guava:guava-testlib:jar:NON-OSGI:22.0',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index 80feb10..8d1d463 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -112,8 +112,8 @@
     "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:jar:2.6.2",
-    "guava": "mvn:com.google.guava:guava:21.0",
-    "guava-testlib": "mvn:com.google.guava:guava-testlib:21.0",
+    "guava": "mvn:com.google.guava:guava:22.0",
+    "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-b32",
     "hk2-locator": "mvn:org.glassfish.hk2:hk2-locator:2.5.0-b32",
diff --git a/lib/pom.xml b/lib/pom.xml
index 41c5145..608149b 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -46,7 +46,7 @@
         <jetty.version>9.2.21.v20170120</jetty.version>
         <jackson.version>2.8.8</jackson.version>
         <slf4j.version>1.7.21</slf4j.version>
-        <guava.version>21.0</guava.version>
+        <guava.version>22.0</guava.version>
         <commons.io.version>2.4</commons.io.version>
         <!-- TODO argLine was originally added maven-surfire-plugin configuration
                   to fix locale errors for non-US developers. However, it breaks