From d4b4d86cbf44b6dd00950a4d34caea392993ea8b Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 25 Oct 2016 09:45:13 -0700 Subject: [PATCH 1/2] Auto-update dependencies. (#383) --- appengine/cloudsql/pom.xml | 2 +- .../firebase-event-proxy/gae-firebase-event-proxy/pom.xml | 4 ++-- appengine/images/pom.xml | 2 +- bigquery/pom.xml | 2 +- compute/cmdline/pom.xml | 2 +- language/analysis/pom.xml | 2 +- monitoring/v3/pom.xml | 4 ++-- pom.xml | 4 ++-- storage/json-api/pom.xml | 2 +- storage/xml-api/cmdline-sample/pom.xml | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml index 4854ef27167..28cd3f805f1 100644 --- a/appengine/cloudsql/pom.xml +++ b/appengine/cloudsql/pom.xml @@ -44,7 +44,7 @@ mysql mysql-connector-java - 6.0.4 + 6.0.5 diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml index c679035177b..f04db61c1e0 100644 --- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml +++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml @@ -62,12 +62,12 @@ com.fasterxml.jackson.core jackson-core - 2.8.3 + 2.8.4 com.fasterxml.jackson.core jackson-databind - 2.8.3 + 2.8.4 diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml index 441e0e17fe9..a5916a164f3 100644 --- a/appengine/images/pom.xml +++ b/appengine/images/pom.xml @@ -21,7 +21,7 @@ Copyright 2015 Google Inc. All Rights Reserved. appengine-images - 1.9.42 + 1.9.44 diff --git a/bigquery/pom.xml b/bigquery/pom.xml index 35bf61b2b80..f8c80d13623 100644 --- a/bigquery/pom.xml +++ b/bigquery/pom.xml @@ -23,7 +23,7 @@ com.google.apis google-api-services-bigquery - v2-rev325-1.22.0 + v2-rev327-1.22.0 com.google.oauth-client diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml index d7fecad820c..7a450b02792 100644 --- a/compute/cmdline/pom.xml +++ b/compute/cmdline/pom.xml @@ -89,7 +89,7 @@ limitations under the License. - v1-rev127-1.22.0 + v1-rev128-1.22.0 UTF-8 diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml index 2b9ab116120..da296dc6e0e 100644 --- a/language/analysis/pom.xml +++ b/language/analysis/pom.xml @@ -25,7 +25,7 @@ limitations under the License. com.google.apis google-api-services-language - v1beta1-rev10-1.22.0 + v1beta1-rev11-1.22.0 com.google.api-client diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml index d8030694662..460296f7104 100644 --- a/monitoring/v3/pom.xml +++ b/monitoring/v3/pom.xml @@ -65,12 +65,12 @@ org.apache.commons commons-lang3 - 3.4 + 3.5 com.google.apis google-api-services-monitoring - v3-rev11-1.22.0 + v3-rev14-1.22.0 com.google.code.gson diff --git a/pom.xml b/pom.xml index 67484f57813..454874a8ac2 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ - 1.9.42 + 1.9.44 1 1.19.0 1.19.0 @@ -146,7 +146,7 @@ org.mockito mockito-core - 2.2.1 + 2.2.8 test diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml index 4ce2ae28a8f..c93a668b7c4 100644 --- a/storage/json-api/pom.xml +++ b/storage/json-api/pom.xml @@ -39,7 +39,7 @@ com.google.apis google-api-services-storage - v1-rev86-1.22.0 + v1-rev88-1.22.0 com.google.oauth-client diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml index 9cc8b851ff3..bb70a9cc40f 100644 --- a/storage/xml-api/cmdline-sample/pom.xml +++ b/storage/xml-api/cmdline-sample/pom.xml @@ -66,7 +66,7 @@ com.google.apis google-api-services-storage - v1-rev86-1.22.0 + v1-rev88-1.22.0 com.google.http-client From b757c531bad24cac5ce3b903c302595df73922a4 Mon Sep 17 00:00:00 2001 From: "Cedric \"Aridjar\" Paumard" Date: Tue, 25 Oct 2016 19:02:54 +0200 Subject: [PATCH 2/2] update to version 4.0.5 (#384) --- compute/mailjet/pom.xml | 2 +- .../java/com/example/compute/mailjet/MailjetSender.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compute/mailjet/pom.xml b/compute/mailjet/pom.xml index f9e7cf30bff..b975cc89644 100644 --- a/compute/mailjet/pom.xml +++ b/compute/mailjet/pom.xml @@ -50,7 +50,7 @@ com.mailjet mailjet-client - 4.0.1 + 4.0.5 diff --git a/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java b/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java index 93a06515a3e..fc39c511333 100644 --- a/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java +++ b/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java @@ -21,6 +21,7 @@ import com.mailjet.client.MailjetRequest; import com.mailjet.client.MailjetResponse; import com.mailjet.client.errors.MailjetException; +import com.mailjet.client.errors.MailjetSocketTimeoutException; import com.mailjet.client.resource.Email; // [END mailjet_imports] @@ -30,7 +31,7 @@ // [START app] public class MailjetSender{ - public static void main(String[] args) { + public static void main(String[] args) throws MailjetException, MailjetSocketTimeoutException { final String mailjetApiKey = "YOUR-MAILJET-API-KEY"; final String mailjetSecretKey = "YOUR-MAILJET-SECRET-KEY"; MailjetClient client = new MailjetClient(mailjetApiKey, mailjetSecretKey); @@ -39,7 +40,8 @@ public static void main(String[] args) { sender.sendMailjet(args[0], args[1], client); } - public MailjetResponse sendMailjet(String recipient, String sender, MailjetClient client) { + public MailjetResponse sendMailjet(String recipient, String sender, MailjetClient client) + throws MailjetException, MailjetSocketTimeoutException { MailjetRequest email = new MailjetRequest(Email.resource) .property(Email.FROMEMAIL, sender) .property(Email.FROMNAME, "pandora")