Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update mailjet samples to new version. #394

Merged
merged 1 commit into from
Nov 3, 2016
Merged

Update mailjet samples to new version. #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions appengine/mailjet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
<version>1.0.0</version>
<relativePath>../..</relativePath>
</parent>
<properties>
<mailjet.version>4.0.5</mailjet.version>
</properties>
<dependencies>
<dependency>
<groupId>com.mailjet</groupId>
<artifactId>mailjet-client</artifactId>
<version>4.0.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar</systemPath>
<version>${mailjet.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
3 changes: 3 additions & 0 deletions appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,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 Down Expand Up @@ -64,6 +65,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
resp.getWriter().print(response.getData());
} catch (MailjetException e) {
throw new ServletException("Mailjet Exception", e);
} catch (MailjetSocketTimeoutException e) {
throw new ServletException("Mailjet socket timed out", e);
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion compute/mailjet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<relativePath>../..</relativePath>
</parent>

<properties>
<mailjet.version>4.0.5</mailjet.version>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand All @@ -50,7 +54,7 @@
<dependency>
<groupId>com.mailjet</groupId>
<artifactId>mailjet-client</artifactId>
<version>4.0.5</version>
<version>${mailjet.version}</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand Down
3 changes: 2 additions & 1 deletion flexible/mailjet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<maven-war-plugin-version>3.0.0</maven-war-plugin-version>
<gcloud-maven-plugin-version>2.0.9.121.v20160815</gcloud-maven-plugin-version>
<jetty-maven-plugin-version>9.3.7.v20160115</jetty-maven-plugin-version>
<mailjet-version>4.0.5</mailjet-version>
</properties>

<dependencies>
Expand All @@ -47,7 +48,7 @@
<dependency>
<groupId>com.mailjet</groupId>
<artifactId>mailjet-client</artifactId>
<version>4.0.1</version>
<version>${mailjet-version}</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand Down
3 changes: 3 additions & 0 deletions flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java
View file
Open in desktop
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 Down Expand Up @@ -67,6 +68,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
resp.getWriter().print(response.getData());
} catch (MailjetException e) {
throw new ServletException("Mailjet Exception", e);
} catch (MailjetSocketTimeoutException e) {
throw new ServletException("Mailjet socket timed out", e);
}
}
}
Expand Down