8000 Merge branch 'master' into discovery-endpoints-migration · PoulsQ/java-docs-samples@5352b92 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5352b92

Browse files
author
Frank Natividad
committed
Merge branch 'master' into discovery-endpoints-migration
2 parents 7ef7d53 + c2e1c03 commit 5352b92

File tree

85 files changed

+1330
-206
lines changed

Some content is hidden

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

85 files changed

+1330
-206
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# java-docs-samples
22

3-
[![Build Status](https://travis-ci.org/GoogleCloudPlatform/java-docs-samples.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/java-docs-samples)
3+
[![Circle-CI Build Status](https://circleci.com/gh/GoogleCloudPlatform/java-docs-samples.svg?style=shield&circle-token=117b41ead030b212fc7d519519ee9262c4f3480b)](https://circleci.com/gh/GoogleCloudPlatform/java-docs-samples)
44
[![ghit.me](https://ghit.me/badge.svg?repo=GoogleCloudPlatform/java-docs-samples)](https://ghit.me/repo/GoogleCloudPlatform/java-docs-samples)
55
[![Coverage Status](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples/branch/master/graph/badge.svg)](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples)
66

< E309 /td>

‎appengine/channel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<relativePath>..</relativePath>
2727
</parent>
2828
<properties>
29-
<objectify.version>5.1.15</objectify.version>
29+
<objectify.version>5.1.16</objectify.version>
3030
</properties>
3131
<!-- [START set_versions] -->
3232
<prerequisites>

‎appengine/datastore/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.auto.value</groupId>
4646
<artifactId>auto-value</artifactId>
47-
<version>1.3</version>
47+
<version>1.4</version>
4848
<scope>provided</scope>
4949
</dependency>
5050
<dependency>

‎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.4</endpoints.framework.version>
34+
<endpoints.framework.version>2.0.5</endpoints.framework.version>
3535
<endpoints.management.version>1.0.2</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.0.0</appengine.maven.plugin.version>
40+
<appengine.maven.plugin.version>1.2.0</appengine.maven.plugin.version>
4141
</properties>
4242

4343
<dependencies>

‎appengine/endpoints-frameworks-v2/migration-example/jenkins.sh

100644100755
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,27 @@ function TestEndpoints () {
2222
# Test getGreeting Endpoint (hello world!)
2323
curl -X GET \
2424
"https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting/0" | \
25+
tee "$ERROR_OUTPUT_DIR/response.json" | \
2526
grep "hello version-${2}"
2627

2728
# Test getGreeting Endpoint (goodbye world!)
2829
curl -X GET \
2930
"https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting/1" | \
31+
tee "$ERROR_OUTPUT_DIR/response.json" | \
3032
grep "goodbye world!"
3133

3234
# Test listGreeting Endpoint (hello world! and goodbye world!)
3335
curl -X GET \
3436
"https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting" | \
37+
tee "$ERROR_OUTPUT_DIR/response.json" | \
3538
grep "hello world!\|goodbye world!"
3639

3740
# Test multiply Endpoint (This is a greeting.)
3841
curl -X POST \
3942
-H "Content-Type: application/json" \
4043
--data "{'message':'This is a greeting from instance ${2}'}." \
4144
"https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting/1" | \
45+
tee "$ERROR_OUTPUT_DIR/response.json" | \
4246
grep "This is a greeting from instance ${2}."
4347
}
4448

‎appengine/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Greetings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class Greetings {
4343
public static ArrayList<HelloGreeting> greetings = new ArrayList<HelloGreeting>();
4444

4545
static {
46-
greetings.add(new HelloGreeting("hello version-jerjou-test!"));
46+
greetings.add(new HelloGreeting("hello world!"));
4747
greetings.add(new HelloGreeting("goodbye world!"));
4848
}
4949
//[END api_def]

‎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.pr1</version>
67+
<version>2.9.0.pr2</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>com.fasterxml.jackson.core</groupId>
7171
<artifactId>jackson-databind</artifactId>
72-
<version>2.9.0.pr1</version>
72+
<version>2.9.0.pr2</version>
7373
</dependency>
7474

7575
<!-- Test Dependencies -->

‎appengine/firebase-tictactoe/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
<relativePath>..</relativePath>
2727
</parent>
2828
<properties>
29-
<objectify.version>5.1.15</objectify.version>
29+
<objectify.version>5.1.16</objectify.version>
3030
<servlet-api.version>2.5</servlet-api.version>
3131
<gson.version>2.7</gson.version>
3232
<guava.version>20.0</guava.version>
3333
<google-api-client.version>1.22.0</google-api-client.version>
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.0.0</appengine-maven.version>
37+
<appengine-maven.version>1.2.0</appengine-maven.version>
3838
</properties>
3939
<!-- [START set_versions] -->
4040
<prerequisites>

‎appengine/guestbook-objectify/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<groupId>com.example.appengine</groupId>
2424
<artifactId>appengine-guestbook-objectify</artifactId>
2525
<properties>
26-
<objectify.version>5.1.15</objectify.version>
26+
<objectify.version>5.1.16</objectify.version>
2727
<guava.version>20.0</guava.version>
2828
</properties>
2929
<parent>

‎appengine/memcache/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.googlecode.xmemcached</groupId>
4747
<artifactId>xmemcached</artifactId>
48-
<version>2.3.0</version>
48+
<version>2.3.1</version>
4949
</dependency>
5050
<!-- [END dependencies] -->
5151
</dependencies>

0 commit comments

Comments
 (0)
0