Skip to content

Commit

Permalink
Merge branch 'master' into travis-run-changed
Browse files Browse the repository at this point in the history
  • Loading branch information
jerjou committed Oct 25, 2016
2 parents 0428cb1 + b757c53 commit a8565bb
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion appengine/cloudsql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>6.0.4</version>
<version>6.0.5</version>
</dependency>
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.8.3</version>
<version>2.8.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.3</version>
<version>2.8.4</version>
</dependency>

<!-- Test Dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion appengine/images/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
<artifactId>appengine-images</artifactId>

<properties>
<appengine.sdk.version>1.9.42</appengine.sdk.version>
<appengine.sdk.version>1.9.44</appengine.sdk.version>
</properties>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion bigquery/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-bigquery</artifactId>
<version>v2-rev325-1.22.0</version>
<version>v2-rev327-1.22.0</version>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compute/cmdline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ limitations under the License.
</dependency>
</dependencies>
<properties>
<project.compute.version>v1-rev127-1.22.0</project.compute.version>
<project.compute.version>v1-rev128-1.22.0</project.compute.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
2 changes: 1 addition & 1 deletion compute/mailjet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>com.mailjet</groupId>
<artifactId>mailjet-client</artifactId>
<version>4.0.1</version>
<version>4.0.5</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand All @@ -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);
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion language/analysis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-language</artifactId>
<version>v1beta1-rev10-1.22.0</version>
<version>v1beta1-rev11-1.22.0</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand Down
4 changes: 2 additions & 2 deletions monitoring/v3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
<version>3.5</version>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-monitoring</artifactId>
<version>v3-rev11-1.22.0</version>
<version>v3-rev14-1.22.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</parent>

<properties>
<appengine.sdk.version>1.9.42</appengine.sdk.version>
<appengine.sdk.version>1.9.44</appengine.sdk.version>
<appengine.app.version>1</appengine.app.version>
<project.http.version>1.19.0</project.http.version>
<project.oauth.version>1.19.0</project.oauth.version>
Expand Down Expand Up @@ -146,7 +146,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.2.1</version>
<version>2.2.8</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion storage/json-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-storage</artifactId>
<version>v1-rev86-1.22.0</version>
<version>v1-rev88-1.22.0</version>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
Expand Down
2 changes: 1 addition & 1 deletion storage/xml-api/cmdline-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-storage</artifactId>
<version>v1-rev86-1.22.0</version>
<version>v1-rev88-1.22.0</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
Expand Down

0 comments on commit a8565bb

Please sign in to comment.