From 32bef63588eb6541565435eb169b57658a75ec60 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 19 Dec 2016 22:11:03 +0000 Subject: [PATCH 1/6] Auto-update dependencies. --- appengine/appidentity/pom.xml | 2 +- appengine/channel/pom.xml | 2 +- appengine/datastore/indexes-exploding/pom.xml | 2 +- appengine/datastore/indexes-perfect/pom.xml | 2 +- appengine/datastore/indexes/pom.xml | 2 +- appengine/datastore/pom.xml | 2 +- appengine/firebase-tictactoe/pom.xml | 2 +- appengine/guestbook-objectify/pom.xml | 2 +- appengine/multitenancy/pom.xml | 2 +- appengine/requests/pom.xml | 2 +- appengine/search/pom.xml | 2 +- appengine/taskqueue-push/pom.xml | 2 +- appengine/users/pom.xml | 2 +- bigquery/cloud-client/pom.xml | 2 +- bigquery/pom.xml | 2 +- datastore/cloud-client/pom.xml | 2 +- language/analysis/pom.xml | 2 +- language/cloud-client/pom.xml | 2 +- logging/cloud-client/pom.xml | 2 +- monitoring/v2/pom.xml | 2 +- monitoring/v3/pom.xml | 2 +- pom.xml | 2 +- pubsub/cloud-client/pom.xml | 2 +- speech/grpc/pom.xml | 2 +- storage/cloud-client/pom.xml | 2 +- storage/json-api/pom.xml | 2 +- storage/storage-transfer/pom.xml | 2 +- storage/xml-api/cmdline-sample/pom.xml | 2 +- translate/cloud-client/pom.xml | 2 +- translate/pom.xml | 2 +- vision/face-detection/pom.xml | 2 +- vision/label/pom.xml | 2 +- vision/landmark-detection/pom.xml | 2 +- vision/text/pom.xml | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ 1.22.0 4.12 1.10.19 - 0.30 + 0.31 1.0.0 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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. com.google.truth truth - 0.30 + 0.31 test 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. com.google.truth truth - 0.30 + 0.31 test 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. com.google.truth truth - 0.30 + 0.31 test 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. com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/bigquery/pom.xml b/bigquery/pom.xml index 91fff4cee01..ca7386ab769 100644 --- a/bigquery/pom.xml +++ b/bigquery/pom.xml @@ -54,7 +54,7 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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. com.google.truth truth - 0.30 + 0.31 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 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/monitoring/v2/pom.xml b/monitoring/v2/pom.xml index 11f4f5a9e2a..40d0341ede0 100644 --- a/monitoring/v2/pom.xml +++ b/monitoring/v2/pom.xml @@ -52,7 +52,7 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml index 9a5eafbd51d..653111ecf2f 100644 --- a/monitoring/v3/pom.xml +++ b/monitoring/v3/pom.xml @@ -94,7 +94,7 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/pom.xml b/pom.xml index d60acc67dac..f4561d0b9a5 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ org.mockito mockito-core - 2.3.3 + 2.3.7 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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. com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml index 2d837badc24..241bd744c71 100644 --- a/storage/json-api/pom.xml +++ b/storage/json-api/pom.xml @@ -55,7 +55,7 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml index 056c6ea8393..d47df08619d 100644 --- a/storage/storage-transfer/pom.xml +++ b/storage/storage-transfer/pom.xml @@ -48,7 +48,7 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml index b5330ade32a..cd90c3000f6 100644 --- a/storage/xml-api/cmdline-sample/pom.xml +++ b/storage/xml-api/cmdline-sample/pom.xml @@ -88,7 +88,7 @@ com.google.truth truth - 0.30 + 0.31 test 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 @@ com.google.truth truth - 0.30 + 0.31 test 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. com.google.truth truth - 0.30 + 0.31 diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml index 3fd99275e90..cad60add9d4 100644 --- a/vision/face-detection/pom.xml +++ b/vision/face-detection/pom.xml @@ -63,7 +63,7 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/vision/label/pom.xml b/vision/label/pom.xml index 09803df484b..b91c6bb053c 100644 --- a/vision/label/pom.xml +++ b/vision/label/pom.xml @@ -61,7 +61,7 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml index 6e1fc15f57f..4e7ce3d25d8 100644 --- a/vision/landmark-detection/pom.xml +++ b/vision/landmark-detection/pom.xml @@ -61,7 +61,7 @@ com.google.truth truth - 0.30 + 0.31 test diff --git a/vision/text/pom.xml b/vision/text/pom.xml index 54c5f7ad84b..80549b7ac02 100644 --- a/vision/text/pom.xml +++ b/vision/text/pom.xml @@ -71,7 +71,7 @@ com.google.truth truth - 0.30 + 0.31 test From 6569349df27296d5f5f60afb4e9a2790c6fd0a34 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Mon, 19 Dec 2016 15:37:42 -0800 Subject: [PATCH 2/6] Exclude old version of Guava from the Google APIs client libs. --- bigquery/pom.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/bigquery/pom.xml b/bigquery/pom.xml index ca7386ab769..352676b0206 100644 --- a/bigquery/pom.xml +++ b/bigquery/pom.xml @@ -21,9 +21,20 @@ - com.google.apis - google-api-services-bigquery - v2-rev330-1.22.0 + com.google.apis + google-api-services-bigquery + v2-rev330-1.22.0 + + + com.google.guava + guava-jdk5 + + + + + com.google.guava + guava + 20.0 com.google.oauth-client From 6a672f0b3a21d1ff858aaa15a4f10e9a78832869 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Mon, 19 Dec 2016 16:21:28 -0800 Subject: [PATCH 3/6] Exclude old guava from cloud-monitoring v2 samples. --- monitoring/v2/pom.xml | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/monitoring/v2/pom.xml b/monitoring/v2/pom.xml index 40d0341ede0..e67af8248ce 100644 --- a/monitoring/v2/pom.xml +++ b/monitoring/v2/pom.xml @@ -22,19 +22,30 @@ - com.google.apis - google-api-services-cloudmonitoring - v2beta2-rev64-1.22.0 + com.google.apis + google-api-services-cloudmonitoring + v2beta2-rev64-1.22.0 + + + com.google.guava + guava-jdk5 + + - com.google.oauth-client - google-oauth-client - ${project.oauth.version} + com.google.guava + guava + 20.0 - com.google.http-client - google-http-client-jackson2 - ${project.http.version} + com.google.oauth-client + google-oauth-client + ${project.oauth.version} + + + com.google.http-client + google-http-client-jackson2 + ${project.http.version} com.google.oauth-client From a533314c5dc754791805786534625d4d0cec6cdd Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Mon, 19 Dec 2016 16:38:42 -0800 Subject: [PATCH 4/6] Exclude old guava from cloud-monitoring v3 samples. --- monitoring/v3/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml index 653111ecf2f..ecbf9e19863 100644 --- a/monitoring/v3/pom.xml +++ b/monitoring/v3/pom.xml @@ -41,6 +41,17 @@ com.google.api-client google-api-client 1.22.0 + + + com.google.guava + guava-jdk5 + + + + + com.google.guava + guava + 20.0 com.google.oauth-client From 63417a7029e6ee9cb9901cf6a049f4589b0da011 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Mon, 19 Dec 2016 17:05:16 -0800 Subject: [PATCH 5/6] Exclude old guava from storage-json-api sample. --- storage/json-api/pom.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml index 241bd744c71..4ad01f25225 100644 --- a/storage/json-api/pom.xml +++ b/storage/json-api/pom.xml @@ -25,11 +25,11 @@ com.google.apis-samples storage-json-sample 1 - Sample accessing the Google Cloud Storage JSON API using OAuth 2.0. + storage-json-api - 1.8 - 1.8 + 1.8 + 1.8 @@ -40,6 +40,17 @@ com.google.apis google-api-services-storage v1-rev92-1.22.0 + + + com.google.guava + guava-jdk5 + + + + + com.google.guava + guava + 20.0 com.google.oauth-client From 8d5f0a85c418b15f7253565dfa14d52f1517ff1e Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Mon, 19 Dec 2016 17:14:56 -0800 Subject: [PATCH 6/6] Exclude old guava from google-apis-client dependencies. --- storage/storage-transfer/pom.xml | 11 +++++++++++ storage/xml-api/cmdline-sample/pom.xml | 6 ++++++ vision/face-detection/pom.xml | 6 ++++++ vision/label/pom.xml | 6 ++++++ vision/landmark-detection/pom.xml | 6 ++++++ vision/text/pom.xml | 6 ++++++ 6 files changed, 41 insertions(+) diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml index d47df08619d..001683c1033 100644 --- a/storage/storage-transfer/pom.xml +++ b/storage/storage-transfer/pom.xml @@ -42,6 +42,17 @@ com.google.apis google-api-services-storagetransfer v1-rev8-1.22.0 + + + com.google.guava + guava-jdk5 + + + + + com.google.guava + guava + 20.0 diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml index cd90c3000f6..d8e7196d140 100644 --- a/storage/xml-api/cmdline-sample/pom.xml +++ b/storage/xml-api/cmdline-sample/pom.xml @@ -67,6 +67,12 @@ com.google.apis google-api-services-storage v1-rev92-1.22.0 + + + com.google.guava + guava-jdk5 + + com.google.http-client diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml index cad60add9d4..501230e83ea 100644 --- a/vision/face-detection/pom.xml +++ b/vision/face-detection/pom.xml @@ -45,6 +45,12 @@ com.google.api-client google-api-client 1.22.0 + + + com.google.guava + guava-jdk5 + + diff --git a/vision/label/pom.xml b/vision/label/pom.xml index b91c6bb053c..3b643671cc1 100644 --- a/vision/label/pom.xml +++ b/vision/label/pom.xml @@ -44,6 +44,12 @@ com.google.api-client google-api-client 1.22.0 + + + com.google.guava + guava-jdk5 + + com.google.guava diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml index 4e7ce3d25d8..5b0671e5f81 100644 --- a/vision/landmark-detection/pom.xml +++ b/vision/landmark-detection/pom.xml @@ -44,6 +44,12 @@ com.google.api-client google-api-client 1.22.0 + + + com.google.guava + guava-jdk5 + + com.google.guava diff --git a/vision/text/pom.xml b/vision/text/pom.xml index 80549b7ac02..1bf680c4183 100644 --- a/vision/text/pom.xml +++ b/vision/text/pom.xml @@ -44,6 +44,12 @@ com.google.api-client google-api-client 1.22.0 + + + com.google.guava + guava-jdk5 + + com.google.guava