chore(deps): update dependency org.apache.maven.plugins:maven-war-plugin to v3.3.0 (GoogleCloudPlatform#3089)

renovate-bot · web-flow · commit a35ab2b26342 · 2020-06-09T16:48:05.000Z
This PR contains the following updates: | Package | Update | Change | |---|---|---| | org.apache.maven.plugins:maven-war-plugin | minor | `3.2.3` -> `3.3.0` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Never, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/java-docs-samples).
diff --git a/appengine-java11/cloudsql/pom.xml b/appengine-java11/cloudsql/pom.xml
@@ -96,7 +96,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/appengine-java11/gaeinfo/pom.xml b/appengine-java11/gaeinfo/pom.xml
@@ -94,7 +94,7 @@ Copyright 2019 Google LLC
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/appengine-java11/spanner/pom.xml b/appengine-java11/spanner/pom.xml
@@ -84,7 +84,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/appengine-java11/tasks/pom.xml b/appengine-java11/tasks/pom.xml
@@ -82,7 +82,7 @@ Copyright 2019 Google LLC
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>
diff --git a/appengine-java11/tasks/src/test/java/com/example/task/CreateTaskIT.java b/appengine-java11/tasks/src/test/java/com/example/task/CreateTaskIT.java
@@ -17,11 +17,13 @@
 package com.example.task;
 
 import static com.google.common.truth.Truth.assertThat;
+import static junit.framework.TestCase.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -34,6 +36,19 @@ public class CreateTaskIT {
   private ByteArrayOutputStream bout;
   private PrintStream out;
 
+  private static void requireEnvVar(String varName) {
+    assertNotNull(
+        "Environment variable '%s' is required to perform these tests.".format(varName),
+        System.getenv(varName));
+  }
+
+  @BeforeClass
+  public static void checkRequirements() {
+    requireEnvVar("LOCATION_ID");
+    requireEnvVar("QUEUE_ID");
+    requireEnvVar("GOOGLE_CLOUD_PROJECT");
+  }
+
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
diff --git a/appengine-java8/bigquery/pom.xml b/appengine-java8/bigquery/pom.xml
@@ -129,7 +129,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/bigtable/pom.xml b/appengine-java8/bigtable/pom.xml
@@ -122,7 +122,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <archiveClasses>true</archiveClasses>
           <webResources>
diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml
@@ -84,7 +84,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <webResources>
             <resources>
diff --git a/appengine-java8/endpoints-v2-guice/pom.xml b/appengine-java8/endpoints-v2-guice/pom.xml
@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <webResources>
             <resources>
diff --git a/appengine-java8/endpoints-v2-skeleton/pom.xml b/appengine-java8/endpoints-v2-skeleton/pom.xml
@@ -71,7 +71,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <webResources>
             <resources>
diff --git a/appengine-java8/gaeinfo/pom.xml b/appengine-java8/gaeinfo/pom.xml
@@ -81,7 +81,7 @@ Copyright 2017 Google Inc.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <webResources>
             <!-- in order to interpolate version from pom into appengine-web.xml -->
diff --git a/appengine-java8/images/pom.xml b/appengine-java8/images/pom.xml
@@ -76,7 +76,7 @@ Copyright 2015 Google Inc.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine-java8/memcache/pom.xml b/appengine-java8/memcache/pom.xml
@@ -76,7 +76,7 @@ Copyright 2015 Google Inc.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/metadata/pom.xml b/appengine-java8/metadata/pom.xml
@@ -76,7 +76,7 @@ Copyright 2017 Google Inc.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <webResources>
             <!-- in order to interpolate version from pom into appengine-web.xml -->
diff --git a/appengine-java8/oauth2/pom.xml b/appengine-java8/oauth2/pom.xml
@@ -75,7 +75,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/requests/pom.xml b/appengine-java8/requests/pom.xml
@@ -115,7 +115,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/search/pom.xml b/appengine-java8/search/pom.xml
@@ -105,7 +105,7 @@ Copyright 2015 Google Inc.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine-java8/sparkjava-helloworld/pom.xml b/appengine-java8/sparkjava-helloworld/pom.xml
@@ -106,7 +106,7 @@ limitations under the License.
     <plugins>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>
diff --git a/appengine-java8/springboot-helloworld/pom.xml b/appengine-java8/springboot-helloworld/pom.xml
@@ -117,7 +117,7 @@
 
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>
diff --git a/appengine-java8/taskqueues-deferred/pom.xml b/appengine-java8/taskqueues-deferred/pom.xml
@@ -99,7 +99,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/taskqueues-pull/pom.xml b/appengine-java8/taskqueues-pull/pom.xml
@@ -93,7 +93,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/taskqueues-push/pom.xml b/appengine-java8/taskqueues-push/pom.xml
@@ -113,7 +113,7 @@ Copyright 2016 Google Inc.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/tasks/app/pom.xml b/appengine-java8/tasks/app/pom.xml
@@ -92,7 +92,7 @@ Copyright 2019 Google LLC
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/appengine-java8/tasks/quickstart/pom.xml b/appengine-java8/tasks/quickstart/pom.xml
@@ -92,11 +92,11 @@ Copyright 2018 Google LLC
         </configuration>
       </plugin>
 
-      <plugin>
+      <!-- <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
-      </plugin>
+        <version>3.3.0</version>
+      </plugin> -->
 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/appengine-java8/tasks/quickstart/src/test/java/com/example/task/CreateTaskIT.java b/appengine-java8/tasks/quickstart/src/test/java/com/example/task/CreateTaskIT.java
@@ -17,11 +17,13 @@
 package com.example.task;
 
 import static com.google.common.truth.Truth.assertThat;
+import static junit.framework.TestCase.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -38,6 +40,19 @@ public class CreateTaskIT {
   private String location = System.getenv("LOCATION_ID");
   private String queueName = System.getenv("QUEUE_ID");
 
+  private static void requireEnvVar(String varName) {
+    assertNotNull(
+        "Environment variable '%s' is required to perform these tests.".format(varName),
+        System.getenv(varName));
+  }
+
+  @BeforeClass
+  public static void checkRequirements() {
+    requireEnvVar("LOCATION_ID");
+    requireEnvVar("QUEUE_ID");
+    requireEnvVar("GOOGLE_CLOUD_PROJECT");
+  }
+
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
diff --git a/appengine-java8/translate-pubsub/pom.xml b/appengine-java8/translate-pubsub/pom.xml
@@ -94,7 +94,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
 
     </plugins>
diff --git a/endpoints/getting-started/pom.xml b/endpoints/getting-started/pom.xml
@@ -63,7 +63,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
       </plugin>
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
diff --git a/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java b/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2017 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,26 +12,23 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
-
+ */
 
 package com.example.endpoints;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-
 import java.io.IOException;
 import java.util.Base64;
-
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 // [START endpoints_auth_info_backend]
 /**
- * A servlet that returns authentication information.
- * See openapi.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
+ * A servlet that returns authentication information. See openapi.yaml for authentication mechanisms
+ * (e.g. JWT tokens, Google ID token).
  */
 @WebServlet("/auth/info/*")
 public class AuthInfoServlet extends HttpServlet {
diff --git a/endpoints/getting-started/src/main/java/com/example/endpoints/EchoServlet.java b/endpoints/getting-started/src/main/java/com/example/endpoints/EchoServlet.java
@@ -20,18 +20,14 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.stream.JsonReader;
-
 import java.io.IOException;
 import java.util.Map;
-
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
- * A servlet that echoes JSON message bodies.
- */
+/** A servlet that echoes JSON message bodies. */
 @WebServlet("/echo")
 public class EchoServlet extends HttpServlet {
 
diff --git a/flexible/gaeinfo/pom.xml b/flexible/gaeinfo/pom.xml
@@ -78,7 +78,7 @@ Copyright 2017 Google Inc.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <webResources>
             <!-- in order to interpolate version from pom into appengine-web.xml -->
diff --git a/unittests/pom.xml b/unittests/pom.xml
@@ -81,7 +81,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <configuration>
           <archiveClasses>true</archiveClasses>
           <webResources>
