diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
index 2a04c676268..22c94aa7fb3 100644
--- a/appengine/appidentity/pom.xml
+++ b/appengine/appidentity/pom.xml
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/appengine/channel/pom.xml b/appengine/channel/pom.xml
index cfbdf6ac4ed..d116c46ba21 100644
--- a/appengine/channel/pom.xml
+++ b/appengine/channel/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
-            <version>0.30</version>
+            <version>0.31</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/appengine/datastore/indexes-exploding/pom.xml b/appengine/datastore/indexes-exploding/pom.xml
index 11d3ed3aabf..02ab18d0e99 100644
--- a/appengine/datastore/indexes-exploding/pom.xml
+++ b/appengine/datastore/indexes-exploding/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/appengine/datastore/indexes-perfect/pom.xml b/appengine/datastore/indexes-perfect/pom.xml
index 33279493428..3f54c202ad5 100644
--- a/appengine/datastore/indexes-perfect/pom.xml
+++ b/appengine/datastore/indexes-perfect/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/appengine/datastore/indexes/pom.xml b/appengine/datastore/indexes/pom.xml
index 4f800629cf6..ce62b653064 100644
--- a/appengine/datastore/indexes/pom.xml
+++ b/appengine/datastore/indexes/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/appengine/datastore/pom.xml b/appengine/datastore/pom.xml
index 721ded97c1c..563c6d49566 100644
--- a/appengine/datastore/pom.xml
+++ b/appengine/datastore/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/appengine/firebase-tictactoe/pom.xml b/appengine/firebase-tictactoe/pom.xml
index a52658cb461..5ee34a56fe7 100644
--- a/appengine/firebase-tictactoe/pom.xml
+++ b/appengine/firebase-tictactoe/pom.xml
@@ -33,7 +33,7 @@
         <google-api-client.version>1.22.0</google-api-client.version>
         <junit.version>4.12</junit.version>
         <mockito.version>1.10.19</mockito.version>
-        <google-truth.version>0.30</google-truth.version>
+        <google-truth.version>0.31</google-truth.version>
         <appengine-maven.version>1.0.0</appengine-maven.version>
     </properties>
     <!-- [START set_versions] -->
diff --git a/appengine/guestbook-objectify/pom.xml b/appengine/guestbook-objectify/pom.xml
index 48627e4a17e..debe06f55b7 100644
--- a/appengine/guestbook-objectify/pom.xml
+++ b/appengine/guestbook-objectify/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
-            <version>0.30</version>
+            <version>0.31</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/appengine/multitenancy/pom.xml b/appengine/multitenancy/pom.xml
index 45bf5aaf0f7..8ac6256bb75 100644
--- a/appengine/multitenancy/pom.xml
+++ b/appengine/multitenancy/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
-            <version>0.30</version>
+            <version>0.31</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/appengine/requests/pom.xml b/appengine/requests/pom.xml
index 1de8f695f37..347f5e3c148 100644
--- a/appengine/requests/pom.xml
+++ b/appengine/requests/pom.xml
@@ -84,7 +84,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/appengine/search/pom.xml b/appengine/search/pom.xml
index e25942b13cf..c990803ab9f 100644
--- a/appengine/search/pom.xml
+++ b/appengine/search/pom.xml
@@ -73,7 +73,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/appengine/taskqueue-push/pom.xml b/appengine/taskqueue-push/pom.xml
index d1517c63d82..f904872a241 100644
--- a/appengine/taskqueue-push/pom.xml
+++ b/appengine/taskqueue-push/pom.xml
@@ -79,7 +79,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/appengine/users/pom.xml b/appengine/users/pom.xml
index 7b3d388b59b..5ecc5616eba 100644
--- a/appengine/users/pom.xml
+++ b/appengine/users/pom.xml
@@ -85,7 +85,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml
index aef17e92743..f6bb3cace9d 100644
--- a/bigquery/cloud-client/pom.xml
+++ b/bigquery/cloud-client/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/bigquery/pom.xml b/bigquery/pom.xml
index 91fff4cee01..352676b0206 100644
--- a/bigquery/pom.xml
+++ b/bigquery/pom.xml
@@ -21,9 +21,20 @@
 
   <dependencies>
     <dependency>
-        <groupId>com.google.apis</groupId>
-        <artifactId>google-api-services-bigquery</artifactId>
-        <version>v2-rev330-1.22.0</version>
+      <groupId>com.google.apis</groupId>
+      <artifactId>google-api-services-bigquery</artifactId>
+      <version>v2-rev330-1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>20.0</version>
     </dependency>
     <dependency>
         <groupId>com.google.oauth-client</groupId>
@@ -54,7 +65,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml
index ca35eda02e7..f0d2e598768 100644
--- a/datastore/cloud-client/pom.xml
+++ b/datastore/cloud-client/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml
index 3aa34afb5fe..5b6c91e1ba0 100644
--- a/language/analysis/pom.xml
+++ b/language/analysis/pom.xml
@@ -43,7 +43,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml
index efd74f31603..c4535e03e98 100644
--- a/language/cloud-client/pom.xml
+++ b/language/cloud-client/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml
index 8761a2c2af4..19f041ea94f 100644
--- a/logging/cloud-client/pom.xml
+++ b/logging/cloud-client/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/monitoring/v2/pom.xml b/monitoring/v2/pom.xml
index 11f4f5a9e2a..e67af8248ce 100644
--- a/monitoring/v2/pom.xml
+++ b/monitoring/v2/pom.xml
@@ -22,19 +22,30 @@
 
   <dependencies>
     <dependency>
-        <groupId>com.google.apis</groupId>
-        <artifactId>google-api-services-cloudmonitoring</artifactId>
-        <version>v2beta2-rev64-1.22.0</version>
+      <groupId>com.google.apis</groupId>
+      <artifactId>google-api-services-cloudmonitoring</artifactId>
+      <version>v2beta2-rev64-1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client</artifactId>
-        <version>${project.oauth.version}</version>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>20.0</version>
     </dependency>
     <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-jackson2</artifactId>
-        <version>${project.http.version}</version>
+      <groupId>com.google.oauth-client</groupId>
+      <artifactId>google-oauth-client</artifactId>
+      <version>${project.oauth.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-jackson2</artifactId>
+      <version>${project.http.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.oauth-client</groupId>
@@ -52,7 +63,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml
index 9a5eafbd51d..ecbf9e19863 100644
--- a/monitoring/v3/pom.xml
+++ b/monitoring/v3/pom.xml
@@ -41,6 +41,17 @@
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
             <version>1.22.0</version>
+            <exclusions>
+                <exclusion> <!-- exclude an old version of Guava -->
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava-jdk5</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>20.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.oauth-client</groupId>
@@ -94,7 +105,7 @@
         <dependency>
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
-            <version>0.30</version>
+            <version>0.31</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index d60acc67dac..f4561d0b9a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.3.3</version>
+            <version>2.3.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml
index 53ce5351118..d6361384e8f 100644
--- a/pubsub/cloud-client/pom.xml
+++ b/pubsub/cloud-client/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/speech/grpc/pom.xml b/speech/grpc/pom.xml
index fe02a629f2c..7ba56f2ec15 100644
--- a/speech/grpc/pom.xml
+++ b/speech/grpc/pom.xml
@@ -153,7 +153,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml
index ff4fcd8bf5c..f1f5871b104 100644
--- a/storage/cloud-client/pom.xml
+++ b/storage/cloud-client/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml
index 2d837badc24..4ad01f25225 100644
--- a/storage/json-api/pom.xml
+++ b/storage/json-api/pom.xml
@@ -25,11 +25,11 @@
   <groupId>com.google.apis-samples</groupId>
   <artifactId>storage-json-sample</artifactId>
   <version>1</version>
-  <name>Sample accessing the Google Cloud Storage JSON API using OAuth 2.0.</name>
+  <name>storage-json-api</name>
 
   <properties>
-      <maven.compiler.target>1.8</maven.compiler.target>
-      <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
 
   <build>
@@ -40,6 +40,17 @@
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-storage</artifactId>
       <version>v1-rev92-1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>20.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.oauth-client</groupId>
@@ -55,7 +66,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml
index 056c6ea8393..001683c1033 100644
--- a/storage/storage-transfer/pom.xml
+++ b/storage/storage-transfer/pom.xml
@@ -42,13 +42,24 @@
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-storagetransfer</artifactId>
       <version>v1-rev8-1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>20.0</version>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml
index b5330ade32a..d8e7196d140 100644
--- a/storage/xml-api/cmdline-sample/pom.xml
+++ b/storage/xml-api/cmdline-sample/pom.xml
@@ -67,6 +67,12 @@
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-storage</artifactId>
       <version>v1-rev92-1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
@@ -88,7 +94,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/translate/cloud-client/pom.xml b/translate/cloud-client/pom.xml
index b2839c761f4..22c7f586ccd 100644
--- a/translate/cloud-client/pom.xml
+++ b/translate/cloud-client/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/translate/pom.xml b/translate/pom.xml
index 220a9a65ca3..b750b708f17 100644
--- a/translate/pom.xml
+++ b/translate/pom.xml
@@ -49,7 +49,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml
index 3fd99275e90..501230e83ea 100644
--- a/vision/face-detection/pom.xml
+++ b/vision/face-detection/pom.xml
@@ -45,6 +45,12 @@
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
       <version>1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- [END dependencies] -->
     <dependency>
@@ -63,7 +69,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/vision/label/pom.xml b/vision/label/pom.xml
index 09803df484b..3b643671cc1 100644
--- a/vision/label/pom.xml
+++ b/vision/label/pom.xml
@@ -44,6 +44,12 @@
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
       <version>1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -61,7 +67,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml
index 6e1fc15f57f..5b0671e5f81 100644
--- a/vision/landmark-detection/pom.xml
+++ b/vision/landmark-detection/pom.xml
@@ -44,6 +44,12 @@
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
       <version>1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -61,7 +67,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/vision/text/pom.xml b/vision/text/pom.xml
index 54c5f7ad84b..1bf680c4183 100644
--- a/vision/text/pom.xml
+++ b/vision/text/pom.xml
@@ -44,6 +44,12 @@
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
       <version>1.22.0</version>
+      <exclusions>
+        <exclusion> <!-- exclude an old version of Guava -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -71,7 +77,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.30</version>
+      <version>0.31</version>
       <scope>test</scope>
     </dependency>
     <dependency>