From 51dfd8b96f774fba2e668b5dfcd8661f6083327e Mon Sep 17 00:00:00 2001
From: Dane Zeke Liergaard <dzlier@google.com>
Date: Mon, 18 Jun 2018 11:02:26 -0700
Subject: [PATCH] Update version of guava dependency in failing tests. (#1137)

---
 appengine-java8/appidentity/pom.xml           |   2 +-
 appengine-java8/datastore/pom.xml             |   2 +-
 appengine-java8/requests/pom.xml              |   2 +-
 appengine-java8/users/pom.xml                 |   2 +-
 appengine/appidentity/pom.xml                 |   2 +-
 .../endpoints-frameworks-v2/backend/pom.xml   | 226 +++++++++---------
 .../guice-example/pom.xml                     |   4 +
 .../migration-example/pom.xml                 |   4 +
 appengine/requests/pom.xml                    |  17 +-
 appengine/taskqueue/defer-samples/pom.xml     |   4 +
 appengine/users/pom.xml                       |   2 +-
 storage/json-api/pom.xml                      |   2 +-
 vision/face-detection/pom.xml                 |   2 +-
 vision/label/pom.xml                          |   2 +-
 vision/landmark-detection/pom.xml             |   2 +-
 vision/text/pom.xml                           |   2 +-
 16 files changed, 147 insertions(+), 130 deletions(-)

diff --git a/appengine-java8/appidentity/pom.xml b/appengine-java8/appidentity/pom.xml
index 6bf485ff350..7cc6d3ffbcd 100644
--- a/appengine-java8/appidentity/pom.xml
+++ b/appengine-java8/appidentity/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
 
     <dependency>
diff --git a/appengine-java8/datastore/pom.xml b/appengine-java8/datastore/pom.xml
index 2db945bc09a..9a70eca537a 100644
--- a/appengine-java8/datastore/pom.xml
+++ b/appengine-java8/datastore/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
 
     <dependency>
diff --git a/appengine-java8/requests/pom.xml b/appengine-java8/requests/pom.xml
index 2aa4b4df834..63cfd447a83 100644
--- a/appengine-java8/requests/pom.xml
+++ b/appengine-java8/requests/pom.xml
@@ -54,7 +54,7 @@ Copyright 2016 Google Inc.
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>20.0</version>
+            <version>25.1-android</version>
         </dependency>
 
         <dependency>
diff --git a/appengine-java8/users/pom.xml b/appengine-java8/users/pom.xml
index 04dd6e053b9..97821f49afd 100644
--- a/appengine-java8/users/pom.xml
+++ b/appengine-java8/users/pom.xml
@@ -45,7 +45,7 @@ Copyright 2015 Google Inc.
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
 
     <dependency>
diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
index c11dea51097..d1fb6f3a3d5 100644
--- a/appengine/appidentity/pom.xml
+++ b/appengine/appidentity/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
index 294453fbb79..b9214d7e294 100644
--- a/appengine/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -14,123 +14,127 @@
  limitations under the License.
 -->
 <project>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
-    <version>1.0-SNAPSHOT</version>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
 
-    <groupId>com.example.echo</groupId>
-    <artifactId>echo</artifactId>
+  <groupId>com.example.echo</groupId>
+  <artifactId>echo</artifactId>
 
-    <!--
-      The parent pom defines common style checks and testing strategies for our samples.
-      Removing or replacing it should not effect the execution of the samples in anyway.
-    -->
-    <parent>
-        <groupId>com.google.cloud.samples</groupId>
-        <artifactId>shared-configuration</artifactId>
-        <version>1.0.9</version>
-    </parent>
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not effect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.9</version>
+  </parent>
 
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <endpoints.framework.version>2.1.0</endpoints.framework.version>
+    <endpoints.framework.version>2.1.0</endpoints.framework.version>
 
-        <endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
-    </properties>
+    <endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
+    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
+  </properties>
 
-    <dependencies>
-        <!-- Compile/runtime dependencies -->
-        <dependency>
-            <groupId>com.google.endpoints</groupId>
-            <artifactId>endpoints-framework</artifactId>
-            <version>${endpoints.framework.version}</version>
-        </dependency>
-        <!-- [START api_management] -->
-        <dependency>
-            <groupId>com.google.endpoints</groupId>
-            <artifactId>endpoints-management-control-appengine</artifactId>
-            <version>1.0.8</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.endpoints</groupId>
-            <artifactId>endpoints-framework-auth</artifactId>
-            <version>1.0.8</version>
-        </dependency>
-        <!-- [END api_management] -->
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>1.9.64</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <!-- Compile/runtime dependencies -->
+    <dependency>
+      <groupId>com.google.endpoints</groupId>
+      <artifactId>endpoints-framework</artifactId>
+      <version>${endpoints.framework.version}</version>
+    </dependency>
+    <!-- [START api_management] -->
+    <dependency>
+      <groupId>com.google.endpoints</groupId>
+      <artifactId>endpoints-management-control-appengine</artifactId>
+      <version>1.0.8</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.endpoints</groupId>
+      <artifactId>endpoints-framework-auth</artifactId>
+      <version>1.0.8</version>
+    </dependency>
+    <!-- [END api_management] -->
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>1.9.64</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <!-- for hot reload of the web application-->
-        <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
-        <plugins>
-            <plugin>
-                <groupId>com.google.cloud.tools</groupId>
-                <artifactId>appengine-maven-plugin</artifactId>
-                <version>${appengine.maven.plugin.version}</version>
-                <configuration>
-                    <!-- deploy configuration -->
-                </configuration>
-            </plugin>
-            <!-- [START endpoints_plugin] -->
-            <plugin>
-                <groupId>com.google.cloud.tools</groupId>
-                <artifactId>endpoints-framework-maven-plugin</artifactId>
-                <version>1.0.2</version>
-                <configuration>
-                    <!-- plugin configuration -->
-                    <hostname>${endpoints.project.id}.appspot.com</hostname>
-                </configuration>
-            </plugin>
-            <!-- [END endpoints_plugin] -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>${basedir}/src/main/webapp/WEB-INF</directory>
-                            <filtering>true</filtering>
-                            <targetPath>WEB-INF</targetPath>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>display-dependency-updates</goal>
-                            <goal>display-plugin-updates</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <!-- for hot reload of the web application-->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
+    </outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>${appengine.maven.plugin.version}</version>
+        <configuration>
+          <!-- deploy configuration -->
+        </configuration>
+      </plugin>
+      <!-- [START endpoints_plugin] -->
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>endpoints-framework-maven-plugin</artifactId>
+        <version>1.0.2</version>
+        <configuration>
+          <!-- plugin configuration -->
+          <hostname>${endpoints.project.id}.appspot.com</hostname>
+        </configuration>
+      </plugin>
+      <!-- [END endpoints_plugin] -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+              <filtering>true</filtering>
+              <targetPath>WEB-INF</targetPath>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-maven-plugin</artifactId>
+        <version>2.3</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>display-dependency-updates</goal>
+              <goal>display-plugin-updates</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml
index d874e648e54..861c28d2333 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/pom.xml
+++ b/appengine/endpoints-frameworks-v2/guice-example/pom.xml
@@ -31,6 +31,10 @@
         <version>1.0.9</version>
     </parent>
 
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
+
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml
index 46e5dd16b0a..14af3bf6c1c 100644
--- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml
+++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml
@@ -32,6 +32,10 @@ limitations under the License.
         <version>1.0.9</version>
     </parent>
 
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
+
 
     <properties>
         <maven.compiler.source>1.7</maven.compiler.source>
diff --git a/appengine/requests/pom.xml b/appengine/requests/pom.xml
index 891fe0e8f3c..e7aad1a4d7f 100644
--- a/appengine/requests/pom.xml
+++ b/appengine/requests/pom.xml
@@ -37,15 +37,15 @@ Copyright 2016 Google Inc.
   </properties>
 
   <dependencies>
-   <dependency>
-    <groupId>com.google.appengine</groupId>
-    <artifactId>appengine-maven-plugin</artifactId>
-    <version>1.9.64</version>
-   </dependency>
-   <dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-maven-plugin</artifactId>
+      <version>1.9.64</version>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -100,7 +100,8 @@ Copyright 2016 Google Inc.
   </dependencies>
   <build>
     <!-- for hot reload of the web application -->
-    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
+    </outputDirectory>
     <plugins>
       <plugin>
         <groupId>com.google.appengine</groupId>
diff --git a/appengine/taskqueue/defer-samples/pom.xml b/appengine/taskqueue/defer-samples/pom.xml
index ea62527dbd1..9d8f14c2d57 100644
--- a/appengine/taskqueue/defer-samples/pom.xml
+++ b/appengine/taskqueue/defer-samples/pom.xml
@@ -30,6 +30,10 @@
         <version>1.0.9</version>
     </parent>
 
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
+
     <properties>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.source>1.7</maven.compiler.source>
diff --git a/appengine/users/pom.xml b/appengine/users/pom.xml
index fba2d44602a..b29546e3f49 100644
--- a/appengine/users/pom.xml
+++ b/appengine/users/pom.xml
@@ -42,7 +42,7 @@ Copyright 2015 Google Inc.
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml
index 01b3bf6dec1..11e6201f0d3 100644
--- a/storage/json-api/pom.xml
+++ b/storage/json-api/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>23.0</version>
+      <version>25.1-android</version>
     </dependency>
     <dependency>
       <groupId>com.google.oauth-client</groupId>
diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml
index d8933f47e60..d9d25f0ebb2 100644
--- a/vision/face-detection/pom.xml
+++ b/vision/face-detection/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
 
     <!-- Test Dependencies -->
diff --git a/vision/label/pom.xml b/vision/label/pom.xml
index bf6f529c8ac..18849559140 100644
--- a/vision/label/pom.xml
+++ b/vision/label/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
 
     <!-- Test Dependencies -->
diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml
index e20dc174203..582471b70a7 100644
--- a/vision/landmark-detection/pom.xml
+++ b/vision/landmark-detection/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
 
     <!-- Test Dependencies -->
diff --git a/vision/text/pom.xml b/vision/text/pom.xml
index cb5f23d3604..2a355ae4911 100644
--- a/vision/text/pom.xml
+++ b/vision/text/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>25.1-android</version>
     </dependency>
     <dependency>
       <groupId>org.apache.opennlp</groupId>