8000 Merge branch 'master' into update-endpoints-sample · criskalesh/java-docs-samples@ea93841 · GitHub
[go: up one dir, main page]
8000
Skip to content

Commit ea93841

Browse files
author
Frank Natividad
committed
Merge branch 'master' into update-endpoints-sample
2 parents c5e0895 + 7ae532e commit ea93841

File tree

95 files changed

+1867
-240
lines changed

Some content is hidden

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

95 files changed

+1867
-240
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<properties>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333

34-
<endpoints.framework.version>2.0.6</endpoints.framework.version>
34+
<endpoints.framework.version>2.0.7</endpoints.framework.version>
3535
<endpoints.management.version>1.0.3</endpoints.management.version>
3636

3737
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
3838
<maven.compiler.target>1.7</maven.compiler.target>
3939
<maven.compiler.source>1.7</maven.compiler.source>
40-
<appengine.maven.plugin.version>1.2.1</appengine.maven.plugin.version>
40+
<appengine.maven.plugin.version>1.3.1</appengine.maven.plugin.version>
4141
</properties>
4242

4343
<dependencies>

‎appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
<dependency>
6565
<groupId>com.fasterxml.jackson.core</groupId>
6666
<artifactId>jackson-core</artifactId>
67-
<version>2.9.0.pr2</version>
67+
<version>2.9.0.pr3</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>com.fasterxml.jackson.core</groupId>
7171
<artifactId>jackson-databind</artifactId>
72-
<version>2.9.0.pr2</version>
72+
<version>2.9.0.pr3</version>
7373
</dependency>
7474

7575
<!-- Test Dependencies -->

‎appengine/firebase-tictactoe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<junit.version>4.12</junit.version>
3535
<mockito.version>1.10.19</mockito.version>
3636
<google-truth.version>0.32</google-truth.version>
37-
<appengine-maven.version>1.2.1</appengine-maven.version>
37+
<appengine-maven.version>1.3.1</appengine-maven.version>
3838
</properties>
3939
<!-- [START set_versions] -->
4040
<prerequisites>

‎appengine/helloworld-new-plugins/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Copyright 2015 Google Inc.
5353
<plugin>
5454
<groupId>com.google.cloud.tools</groupId>
5555
<artifactId>appengine-maven-plugin</artifactId>
56-
<version>0.1.2</version>
56+
<version>1.3.0</version>
5757
<configuration>
5858
<!-- dev appserver configuration (standard environment only) -->
5959
<!--

‎appengine/images/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
2121
<artifactId>appengine-images</artifactId>
2222

2323
<properties>
24-
<appengine.sdk.version>1.9.51</appengine.sdk.version>
24+
<appengine.sdk.version>1.9.52</appengine.sdk.version>
2525
</properties>
2626

2727
<parent>

‎appengine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</parent>
3131

3232
<properties>
33-
<appengine.sdk.version>1.9.51</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.52</appengine.sdk.version>
3434
<appengine.app.version>1</appengine.app.version>
3535

3636
<project.http.version>1.19.0</project.http.version>

‎bigquery/cloud-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-bigquery</artifactId>
40-
<version>0.13.0-beta</version>
40+
<version>0.17.2-beta</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>commons-cli</groupId>
4444
<artifactId>commons-cli</artifactId>
45-
<version>1.3.1</version>
45+
<version>1.4</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>joda-time</groupId>

‎compute/cmdline/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ limitations under the License.
8989
</dependency>
9090
</dependencies>
9191
<properties>
92-
<project.compute.version>v1-rev143-1.22.0</project.compute.version>
92+
<project.compute.version>v1-rev145-1.22.0</project.compute.version>
9393
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9494
</properties>
9595
</project>

‎datastore/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-datastore</artifactId>
40-
<version>0.13.0-beta</version>
40+
<version>1.0.1</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

‎datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>0.13.0-beta</version>
44+
<version>1.0.1</version>
4545
</dependency>
4646

4747
<!-- Test dependencies -->

0 commit comments

Comments
 (0)
0