Skip to content

Commit dd8367d

Browse files
dzlier-gcpdzlier-gcp
committed
Update version of guava dependency in failing tests.
1 parent d2d784d commit dd8367d

File tree

16 files changed

+147
-130
lines changed

16 files changed

+147
-130
lines changed

‎appengine-java8/appidentity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.google.guava</groupId>
4747
<artifactId>guava</artifactId>
48-
<version>20.0</version>
48+
<version>25.1-android</version>
4949
</dependency>
5050

5151
<dependency>

‎appengine-java8/datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>com.google.guava</groupId>
6868
<artifactId>guava</artifactId>
69-
<version>20.0</version>
69+
<version>25.1-android</version>
7070
</dependency>
7171

7272
<dependency>

‎appengine-java8/requests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Copyright 2016 Google Inc.
5454
<dependency>
5555
<groupId>com.google.guava</groupId>
5656
<artifactId>guava</artifactId>
57-
<version>20.0</version>
57+
<version>25.1-android</version>
5858
</dependency>
5959

6060
<dependency>

‎appengine-java8/users/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Copyright 2015 Google Inc.
4545
<dependency>
4646
<groupId>com.google.guava</groupId>
4747
<artifactId>guava</artifactId>
48-
<version>20.0</version>
48+
<version>25.1-android</version>
4949
</dependency>
5050

5151
<dependency>

‎appengine/appidentity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.google.guava</groupId>
4646
<artifactId>guava</artifactId>
47-
<version>20.0</version>
47+
<version>25.1-android</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.servlet</groupId>

‎appengine/endpoints-frameworks-v2/backend/pom.xml

Lines changed: 115 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -14,123 +14,127 @@
1414
limitations under the License.
1515
-->
1616
<project>
17-
<modelVersion>4.0.0</modelVersion>
18-
<packaging>war</packaging>
19-
<version>1.0-SNAPSHOT</version>
17+
<modelVersion>4.0.0</modelVersion>
18+
<packaging>war</packaging>
19+
<version>1.0-SNAPSHOT</version>
2020

21-
<groupId>com.example.echo</groupId>
22-
<artifactId>echo</artifactId>
21+
<groupId>com.example.echo</groupId>
22+
<artifactId>echo</artifactId>
2323

24-
<!--
25-
The parent pom defines common style checks and testing strategies for our samples.
26-
Removing or replacing it should not effect the execution of the samples in anyway.
27-
-->
28-
<parent>
29-
<groupId>com.google.cloud.samples</groupId>
30-
<artifactId>shared-configuration</artifactId>
31-
<version>1.0.9</version>
32-
</parent>
24+
<!--
25+
The parent pom defines common style checks and testing strategies for our samples.
26+
Removing or replacing it should not effect the execution of the samples in anyway.
27+
-->
28+
<parent>
29+
<groupId>com.google.cloud.samples</groupId>
30+
<artifactId>shared-configuration</artifactId>
31+
<version>1.0.9</version>
32+
</parent>
3333

34+
<prerequisites>
35+
<maven>3.0</maven>
36+
</prerequisites>
3437

35-
<properties>
36-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38+
<properties>
39+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3740

38-
<endpoints.framework.version>2.1.0</endpoints.framework.version>
41+
<endpoints.framework.version>2.1.0</endpoints.framework.version>
3942

40-
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
41-
<maven.compiler.target>1.7</maven.compiler.target>
42-
<maven.compiler.source>1.7</maven.compiler.source>
43-
<appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
44-
</properties>
43+
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
44+
<maven.compiler.target>1.7</maven.compiler.target>
45+
<maven.compiler.source>1.7</maven.compiler.source>
46+
<appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
47+
</properties>
4548

46-
<dependencies>
47-
<!-- Compile/runtime dependencies -->
48-
<dependency>
49-
<groupId>com.google.endpoints</groupId>
50-
<artifactId>endpoints-framework</artifactId>
51-
<version>${endpoints.framework.version}</version>
52-
</dependency>
53-
<!-- [START api_management] -->
54-
<dependency>
55-
<groupId>com.google.endpoints</groupId>
56-
<artifactId>endpoints-management-control-appengine</artifactId>
57-
<version>1.0.8</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>com.google.endpoints</groupId>
61-
<artifactId>endpoints-framework-auth</artifactId>
62-
<version>1.0.8</version>
63-
</dependency>
64-
<!-- [END api_management] -->
65-
<dependency>
66-
<groupId>com.google.appengine</groupId>
67-
<artifactId>appengine-api-1.0-sdk</artifactId>
68-
<version>1.9.64</version>
69-
</dependency>
70-
<dependency>
71-
<groupId>javax.servlet</groupId>
72-
<artifactId>servlet-api</artifactId>
73-
<version>2.5</version>
74-
<scope>provided</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>javax.inject</groupId>
78-
<artifactId>javax.inject</artifactId>
79-
<version>1</version>
80-
</dependency>
81-
</dependencies>
49+
<dependencies>
50+
<!-- Compile/runtime dependencies -->
51+
<dependency>
52+
<groupId>com.google.endpoints</groupId>
53+
<artifactId>endpoints-framework</artifactId>
54+
<version>${endpoints.framework.version}</version>
55+
</dependency>
56+
<!-- [START api_management] -->
57+
<dependency>
58+
<groupId>com.google.endpoints</groupId>
59+
<artifactId>endpoints-management-control-appengine</artifactId>
60+
<version>1.0.8</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.google.endpoints</groupId>
64+
<artifactId>endpoints-framework-auth</artifactId>
65+
<version>1.0.8</version>
66+
</dependency>
67+
<!-- [END api_management] -->
68+
<dependency>
69+
<groupId>com.google.appengine</groupId>
70+
<artifactId>appengine-api-1.0-sdk</artifactId>
71+
<version>1.9.64</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>javax.servlet</groupId>
75+
<artifactId>servlet-api</artifactId>
76+
<version>2.5</version>
77+
<scope>provided</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>javax.inject</groupId>
81+
<artifactId>javax.inject</artifactId>
82+
<version>1</version>
83+
</dependency>
84+
</dependencies>
8285

83-
<build>
84-
<!-- for hot reload of the web application-->
85-
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
86-
<plugins>
87-
<plugin>
88-
<groupId>com.google.cloud.tools</groupId>
89-
<artifactId>appengine-maven-plugin</artifactId>
90-
<version>${appengine.maven.plugin.version}</version>
91-
<configuration>
92-
<!-- deploy configuration -->
93-
</configuration>
94-
</plugin>
95-
<!-- [START endpoints_plugin] -->
96-
<plugin>
97-
<groupId>com.google.cloud.tools</groupId>
98-
<artifactId>endpoints-framework-maven-plugin</artifactId>
99-
<version>1.0.2</version>
100-
<configuration>
101-
<!-- plugin configuration -->
102-
<hostname>${endpoints.project.id}.appspot.com</hostname>
103-
</configuration>
104-
</plugin>
105-
<!-- [END endpoints_plugin] -->
106-
<plugin>
107-
<groupId>org.apache.maven.plugins</groupId>
108-
<artifactId>maven-war-plugin</artifactId>
109-
<version>2.6</version>
110-
<configuration>
111-
<webResources>
112-
<resource>
113-
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
114-
<filtering>true</filtering>
115-
<targetPath>WEB-INF</targetPath>
116-
</resource>
117-
</webResources>
118-
</configuration>
119-
</plugin>
120-
<plugin>
121-
<groupId>org.codehaus.mojo</groupId>
122-
<artifactId>versions-maven-plugin</artifactId>
123-
<version>2.3</version>
124-
<executions>
125-
<execution>
126-
<phase>compile</phase>
127-
<goals>
128-
<goal>display-dependency-updates</goal>
129-
<goal>display-plugin-updates</goal>
130-
</goals>
131-
</execution>
132-
</executions>
133-
</plugin>
134-
</plugins>
135-
</build>
86+
<build>
87+
<!-- for hot reload of the web application-->
88+
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
89+
</outputDirectory>
90+
<plugins>
91+
<plugin>
92+
<groupId>com.google.cloud.tools</groupId>
93+
<artifactId>appengine-maven-plugin</artifactId>
94+
<version>${appengine.maven.plugin.version}</version>
95+
<configuration>
96+
<!-- deploy configuration -->
97+
</configuration>
98+
</plugin>
99+
<!-- [START endpoints_plugin] -->
100+
<plugin>
101+
<groupId>com.google.cloud.tools</groupId>
102+
<artifactId>endpoints-framework-maven-plugin</artifactId>
103+
<version>1.0.2</version>
104+
<configuration>
105+
<!-- plugin configuration -->
106+
<hostname>${endpoints.project.id}.appspot.com</hostname>
107+
</configuration>
108+
</plugin>
109+
<!-- [END endpoints_plugin] -->
110+
<plugin>
111+
<groupId>org.apache.maven.plugins</groupId>
112+
<artifactId>maven-war-plugin</artifactId>
113+
<version>2.6</version>
114+
<configuration>
115+
<webResources>
116+
<resource>
117+
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
118+
<filtering>true</filtering>
119+
<targetPath>WEB-INF</targetPath>
120+
</resource>
121+
</webResources>
122+
</configuration>
123+
</plugin>
124+
<plugin>
125+
<groupId>org.codehaus.mojo</groupId>
126+
<artifactId>versions-maven-plugin</artifactId>
127+
<version>2.3</version>
128+
<executions>
129+
<execution>
130+
<phase>compile</phase>
131+
<goals>
132+
<goal>display-dependency-updates</goal>
133+
<goal>display-plugin-updates</goal>
134+
</goals>
135+
</execution>
136+
</executions>
137+
</plugin>
138+
</plugins>
139+
</build>
136140
</project>

‎appengine/endpoints-frameworks-v2/guice-example/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
<version>1.0.9</version>
3232
</parent>
3333

34+
<prerequisites>
35+
<maven>3.0</maven>
36+
</prerequisites>
37+
3438

3539
<properties>
3640
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎appengine/endpoints-frameworks-v2/migration-example/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ limitations under the License.
3232
<version>1.0.9</version>
3333
</parent>
3434

35+
<prerequisites>
36+
<maven>3.0</maven>
37+
</prerequisites>
38+
3539

3640
<properties>
3741
<maven.compiler.source>1.7</maven.compiler.source>

‎appengine/requests/pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ Copyright 2016 Google Inc.
3737
</properties>
3838

3939
<dependencies>
40-
<dependency>
41-
<groupId>com.google.appengine</groupId>
42-
<artifactId>appengine-maven-plugin</artifactId>
43-
<version>1.9.64</version>
44-
</dependency>
45-
<dependency>
40+
<dependency>
41+
<groupId>com.google.appengine</groupId>
42+
<artifactId>appengine-maven-plugin</artifactId>
43+
<version>1.9.64</version>
44+
</dependency>
45+
<dependency>
4646
<groupId>com.google.guava</groupId>
4747
<artifactId>guava</artifactId>
48-
<version>20.0</version>
48+
<version>25.1-android</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>javax.servlet</groupId>
@@ -100,7 +100,8 @@ Copyright 2016 Google Inc.
100100
</dependencies>
101101
<build>
102102
<!-- for hot reload of the web application -->
103-
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
103+
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
104+
</outputDirectory>
104105
<plugins>
105106
<plugin>
106107
<groupId>com.google.appengine</groupId>

‎appengine/taskqueue/defer-samples/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
<version>1.0.9</version>
3131
</parent>
3232

33+
<prerequisites>
34+
<maven>3.0</maven>
35+
</prerequisites>
36+
3337
<properties>
3438
<maven.compiler.target>1.7</maven.compiler.target>
3539
<maven.compiler.source>1.7</maven.compiler.source>

‎appengine/users/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Copyright 2015 Google Inc.
4242
<dependency>
4343
<groupId>com.google.guava</groupId>
4444
<artifactId>guava</artifactId>
45-
<version>20.0</version>
45+
<version>25.1-android</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>javax.servlet</groupId>

‎storage/json-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.google.guava</groupId>
5454
<artifactId>guava</artifactId>
55-
<version>23.0</version>
55+
<version>25.1-android</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.oauth-client</groupId>

‎vision/face-detection/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>com.google.guava</groupId>
6060
<artifactId>guava</artifactId>
61-
<version>20.0</version>
61+
<version>25.1-android</version>
6262
</dependency>
6363

6464
<!-- Test Dependencies -->

‎vision/label/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>com.google.guava</groupId>
5858
<artifactId>guava</artifactId>
59-
<version>20.0</version>
59+
<version>25.1-android</version>
6060
</dependency>
6161

6262
<!-- Test Dependencies -->

‎vision/landmark-detection/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>com.google.guava</groupId>
5858
<artifactId>guava</artifactId>
59-
<version>20.0</version>
59+
<version>25.1-android</version>
6060
</dependency>
6161

6262
<!-- Test Dependencies -->

0 commit comments

Comments
 (0)