Skip to content

Commit ea2a69c

Browse files
dzlier-gcpdzlier-gcp
authored
Auto-update dependencies. (#1120)
* Auto-update dependencies. * Update version of guava dependency in failing tests. * Add required maven version to pom.xml's.
1 parent 1160397 commit ea2a69c

File tree

93 files changed

+406
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+406
-376
lines changed

‎appengine-java8/analytics/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>org.mockito</groupId>
8989
<artifactId>mockito-core</artifactId>
90-
<version>2.18.3</version>
90+
<version>2.19.0</version>
9191
<scope>test</scope>
9292
</dependency>
9393
<dependency>
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>com.google.truth</groupId>
100100
<artifactId>truth</artifactId>
101-
<version>0.40</version>
101+
<version>0.41</version>
102102
<scope>test</scope>
103103
</dependency>
104104
</dependencies>

‎appengine-java8/appidentity/pom.xml

Lines changed: 2 additions & 2 deletions
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>
@@ -97,7 +97,7 @@
9797
<dependency>
9898
<groupId>com.google.truth</groupId>
9999
<artifactId>truth</artifactId>
100-
<version>0.40</version>
100+
<version>0.41</version>
101101
<scope>test</scope>
102102
</dependency>
103103
</dependencies>

‎appengine-java8/bigquery/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-bigquery</artifactId>
56-
<version>1.32.0</version>
56+
<version>1.34.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-monitoring</artifactId>
61-
<version>0.50.0-beta</version>
61+
<version>1.34.0</version>
6262
</dependency>
6363
<!-- [END dependencies ] -->
6464

@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>org.mockito</groupId>
9898
<artifactId>mockito-core</artifactId>
99-
<version>2.18.3</version>
99+
<version>2.19.0</version>
100100
<scope>test</scope>
101101
</dependency>
102102
<dependency>
@@ -108,7 +108,7 @@
108108
<dependency>
109109
<groupId>com.google.truth</groupId>
110110
<artifactId>truth</artifactId>
111-
<version>0.40</version>
111+
<version>0.41</version>
112112
<scope>test</scope>
113113
</dependency>
114114
</dependencies>

‎appengine-java8/bigtable/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ limitations under the License.
4646
<dependency>
4747
<groupId>com.google.cloud.bigtable</groupId>
4848
<artifactId>bigtable-hbase-1.x</artifactId>
49-
<version>1.3.0</version>
49+
<version>1.4.0</version>
5050
</dependency>
5151

5252
<!-- Compile/runtime dependencies -->
@@ -68,7 +68,7 @@ limitations under the License.
6868
<dependency>
6969
<groupId>com.google.truth</groupId>
7070
<artifactId>truth</artifactId>
71-
<version>0.40</version>
71+
<version>0.41</version>
7272
<scope>test</scope>
7373
</dependency>
7474

‎appengine-java8/cloudsql-postgres/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>com.google.cloud.sql</groupId>
8181
<artifactId>postgres-socket-factory</artifactId>
82-
<version>1.0.8</version>
82+
<version>1.0.9</version>
8383
</dependency>
8484
<!-- [END dependencies] -->
8585
</dependencies>

‎appengine-java8/cloudsql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>com.google.cloud.sql</groupId>
8282
<artifactId>mysql-socket-factory</artifactId>
83-
<version>1.0.8</version>
83+
<version>1.0.9</version>
8484
</dependency>
8585
<!-- [END dependencies] -->
8686
</dependencies>

‎appengine-java8/datastore-indexes-exploding/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>com.google.truth</groupId>
8585
<artifactId>truth</artifactId>
86-
<version>0.40</version>
86+
<version>0.41</version>
8787
<scope>test</scope>
8888
</dependency>
8989
</dependencies>

‎appengine-java8/datastore-indexes-perfect/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>com.google.truth</groupId>
8585
<artifactId>truth</artifactId>
86-
<version>0.40</version>
86+
<version>0.41</version>
8787
<scope>test</scope>
8888
</dependency>
8989
</dependencies>

‎appengine-java8/datastore-indexes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>com.google.truth</groupId>
8686
<artifactId>truth</artifactId>
87-
<version>0.40</version>
87+
<version>0.41</version>
8888
<scope>test</scope>
8989
</dependency>
9090
</dependencies>

‎appengine-java8/datastore/pom.xml

Lines changed: 2 additions & 2 deletions
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>
@@ -110,7 +110,7 @@
110110
<dependency>
111111
<groupId>com.google.truth</groupId>
112112
<artifactId>truth</artifactId>
113-
<version>0.40</version>
113+
<version>0.41</version>
114114
<scope>test</scope>
115115
</dependency>
116116
</dependencies>

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

Lines changed: 108 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -14,115 +14,120 @@
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-j8</artifactId>
21+
<groupId>com.example.echo</groupId>
22+
<artifactId>echo-j8</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-
<properties>
35-
<maven.compiler.target>1.8</maven.compiler.target>
36-
<maven.compiler.source>1.8</maven.compiler.source>
34+
<prerequisites>
35+
<maven>3.0</maven>
36+
</prerequisites>
3737

38-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38+
<properties>
39+
<maven.compiler.target>1.8</maven.compiler.target>
40+
<maven.compiler.source>1.8</maven.compiler.source>
3941

40-
<endpoints.framework.version>2.0.14</endpoints.framework.version>
41-
<endpoints.management.version>1.0.4</endpoints.management.version>
42+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4243

43-
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
44-
</properties>
44+
<endpoints.framework.version>2.1.0</endpoints.framework.version>
45+
<endpoints.management.version>1.0.4</endpoints.management.version>
4546

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-
<dependency>
54-
<groupId>com.google.endpoints</groupId>
55-
<artifactId>endpoints-management-control-appengine-all</artifactId>
56-
<version>1.0.7</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.google.appengine</groupId>
60-
<artifactId>appengine-api-1.0-sdk</artifactId>
61-
<version>1.9.64</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>javax.servlet</groupId>
65-
<artifactId>javax.servlet-api</artifactId>
66-
<version>3.1.0</version>
67-
<type>jar</type>
68-
<scope>provided</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>javax.inject</groupId>
72-
<artifactId>javax.inject</artifactId>
73-
<version>1</version>
74-
</dependency>
75-
</dependencies>
47+
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
48+
</properties>
7649

77-
<build>
78-
<!-- for hot reload of the web application-->
79-
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
80-
<plugins>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-war-plugin</artifactId>
84-
<version>2.6</version>
85-
<configuration>
86-
<webResources>
87-
<resources>
88-
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
89-
<filtering>true</filtering>
90-
<targetPath>WEB-INF</targetPath>
91-
</resources>
92-
</webResources>
93-
</configuration>
94-
</plugin>
95-
<plugin>
96-
<groupId>com.google.cloud.tools</groupId>
97-
<artifactId>appengine-maven-plugin</artifactId>
98-
<version>1.3.2</version>
99-
<configuration>
100-
<!-- deploy configuration -->
101-
</configuration>
102-
</plugin>
103-
<plugin>
104-
<groupId>com.google.cloud.tools</groupId>
105-
<artifactId>endpoints-framework-maven-plugin</artifactId>
106-
<version>1.0.2</version>
107-
<configuration>
108-
<!-- plugin configuration -->
109-
<hostname>${endpoints.project.id}.appspot.com</hostname>
110-
</configuration>
111-
</plugin>
112-
<plugin>
113-
<groupId>org.codehaus.mojo</groupId>
114-
<artifactId>versions-maven-plugin</artifactId>
115-
<version>2.3</version>
116-
<executions>
117-
<execution>
118-
<phase>compile</phase>
119-
<goals>
120-
<goal>display-dependency-updates</goal>
121-
<goal>display-plugin-updates</goal>
122-
</goals>
123-
</execution>
124-
</executions>
125-
</plugin>
126-
</plugins>
127-
</build>
50+
<dependencies>
51+
<!-- Compile/runtime dependencies -->
52+
<dependency>
53+
<groupId>com.google.endpoints</groupId>
54+
<artifactId>endpoints-framework</artifactId>
55+
<version>${endpoints.framework.version}</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.google.endpoints</groupId>
59+
<artifactId>endpoints-management-control-appengine-all</artifactId>
60+
<version>1.0.8</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.google.appengine</groupId>
64+
<artifactId>appengine-api-1.0-sdk</artifactId>
65+
<version>1.9.64</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>javax.servlet</groupId>
69+
<artifactId>javax.servlet-api</artifactId>
70+
<version>3.1.0</version>
71+
<type>jar</type>
72+
<scope>provided</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>javax.inject</groupId>
76+
<artifactId>javax.inject</artifactId>
77+
<version>1</version>
78+
</dependency>
79+
</dependencies>
80+
81+
<build>
82+
<!-- for hot reload of the web application-->
83+
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
84+
</outputDirectory>
85+
<plugins>
86+
<plugin>
87+
<groupId>org.apache.maven.plugins</groupId>
88+
<artifactId>maven-war-plugin</artifactId>
89+
<version>2.6</version>
90+
<configuration>
91+
<webResources>
92+
<resources>
93+
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
94+
<filtering>true</filtering>
95+
<targetPath>WEB-INF</targetPath>
96+
</resources>
97+
</webResources>
98+
</configuration>
99+
</plugin>
100+
<plugin>
101+
<groupId>com.google.cloud.tools</groupId>
102+
<artifactId>appengine-maven-plugin</artifactId>
103+
<version>1.3.2</version>
104+
<configuration>
105+
<!-- deploy configuration -->
106+
</configuration>
107+
</plugin>
108+
<plugin>
109+
<groupId>com.google.cloud.tools</groupId>
110+
<artifactId>endpoints-framework-maven-plugin</artifactId>
111+
<version>1.0.2</version>
112+
<configuration>
113+
<!-- plugin configuration -->
114+
<hostname>${endpoints.project.id}.appspot.com</hostname>
115+
</configuration>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.codehaus.mojo</groupId>
119+
<artifactId>versions-maven-plugin</artifactId>
120+
<version>2.3</version>
121+
<executions>
122+
<execution>
123+
<phase>compile</phase>
124+
<goals>
125+
<goal>display-dependency-updates</goal>
126+
<goal>display-plugin-updates</goal>
127+
</goals>
128+
</execution>
129+
</executions>
130+
</plugin>
131+
</plugins>
132+
</build>
128133
</project>

0 commit comments

Comments
 (0)