Merge pull request #58 from GoogleCloudPlatform/update-mailgun

lesv · lesv · commit 6c41c88203f4 · 2016-01-19T13:10:03.000-08:00
Update maven plugin version
diff --git a/appengine/analytics/pom.xml b/appengine/analytics/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
         <configuration>
           <promote>true</promote>
         </configuration>
diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
         <configuration>
           <promote>true</promote>
         </configuration>
diff --git a/appengine/cloudstorage/pom.xml b/appengine/cloudstorage/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
         <configuration>
           <promote>true</promote>
         </configuration>
diff --git a/appengine/datastore/pom.xml b/appengine/datastore/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
         <configuration>
           <promote>true</promote>
         </configuration>
diff --git a/appengine/disk/pom.xml b/appengine/disk/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/extending-runtime/pom.xml b/appengine/extending-runtime/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
         <configuration>
           <!-- TODO: change to relative paths when gcloud plugin supports them -->
           <custom_entrypoint>java
diff --git a/appengine/helloworld-mvm/pom.xml b/appengine/helloworld-mvm/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/mailgun/pom.xml b/appengine/mailgun/pom.xml
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java b/appengine/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
@@ -56,6 +56,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
     }
   }
 
+  // [START simple]
   private ClientResponse sendSimpleMessage(String recipient) {
     Client client = Client.create();
     client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
@@ -69,7 +70,9 @@ private ClientResponse sendSimpleMessage(String recipient) {
     return webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class,
         formData);
   }
+  // [END simple]
 
+  // [START complex]
   private ClientResponse sendComplexMessage(String recipient) {
     Client client = Client.create();
     client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
@@ -86,5 +89,6 @@ private ClientResponse sendComplexMessage(String recipient) {
     return webResource.type(MediaType.MULTIPART_FORM_DATA_TYPE)
         .post(ClientResponse.class, formData);
   }
+  // [END complex]
 }
 // [END example]
diff --git a/appengine/memcache/pom.xml b/appengine/memcache/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/sendgrid/pom.xml b/appengine/sendgrid/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/static-files/pom.xml b/appengine/static-files/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/twilio/pom.xml b/appengine/twilio/pom.xml
@@ -47,7 +47,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/websockets/pom.xml b/appengine/websockets/pom.xml
@@ -69,7 +69,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.89.v20151202</version>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ // [START simple]`
`59`	`60`	`private ClientResponse sendSimpleMessage(String recipient) {`
`60`	`61`	`Client client = Client.create();`
`61`	`62`	`client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));`
`@@ -69,7 +70,9 @@ private ClientResponse sendSimpleMessage(String recipient) {`
`69`	`70`	`return webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class,`
`70`	`71`	`formData);`
`71`	`72`	`}`
	`73`	`+ // [END simple]`
`72`	`74`
	`75`	`+ // [START complex]`
`73`	`76`	`private ClientResponse sendComplexMessage(String recipient) {`
`74`	`77`	`Client client = Client.create();`
`75`	`78`	`client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));`
`@@ -86,5 +89,6 @@ private ClientResponse sendComplexMessage(String recipient) {`
`86`	`89`	`return webResource.type(MediaType.MULTIPART_FORM_DATA_TYPE)`
`87`	`90`	`.post(ClientResponse.class, formData);`
`88`	`91`	`}`
	`92`	`+ // [END complex]`
`89`	`93`	`}`
`90`	`94`	`// [END example]`