Skip to content

Commit b9038c9

Browse files
jabubakejabubake
committed
Merge remote-tracking branch 'origin/master' into pubsub_getting_started
2 parents 9404a36 + e066898 commit b9038c9

File tree

151 files changed

+2417
-320
lines changed

Some content is hidden

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

151 files changed

+2417
-320
lines changed

‎.circleci/circle.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
machine:
2+
java:
3+
version: oraclejdk8
4+
dependencies:
5+
pre:
6+
- curl -LO https://github.com/mozilla/geckodriver/releases/download/v0.15.0/geckodriver-v0.15.0-linux64.tar.gz
7+
&& sudo tar -zxf geckodriver-*.tar.gz -C "${HOME}/bin"
8+
- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe"
9+
&& sudo apt-get update
10+
&& sudo apt-get install -t trusty-backports shellcheck
11+
- sudo apt-get install expect
12+
- openssl aes-256-cbc -d -in "${HOME}/${CIRCLE_PROJECT_REPONAME}/service-account.json.enc" -k "${key}" -iv "${iv}" -out "${HOME}/google-cloud-service-key.json"
13+
- export GOOGLE_APPLICATION_CREDENTIALS="${HOME}/google-cloud-service-key.json"
14+
test:
15+
override:
16+
- bash ./travis.sh &&
17+
bash <(curl -s https://codecov.io/bash) # If successful, run code coverage

‎appengine-java8/analytics/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<maven.compiler.source>1.8</maven.compiler.source>
34-
<appengine.sdk.version>1.9.52</appengine.sdk.version>
34+
<appengine.sdk.version>1.9.54</appengine.sdk.version>
3535
</properties>
3636

3737
<dependencies>
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>org.mockito</groupId>
8787
<artifactId>mockito-core</artifactId>
88-
<version>2.7.22</version>
88+
<version>2.8.47</version>
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>com.google.truth</groupId>
9898
<artifactId>truth</artifactId>
99-
<version>0.32</version>
99+
<version>0.33</version>
100100
<scope>test</scope>
101101
</dependency>
102102
</dependencies>

‎appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
// [START example]
3636
@SuppressWarnings("serial")
37+
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
3738
@WebServlet(name = "analytics", description = "Analytics: Send Analytics Event to Google Analytics",
3839
urlPatterns = "/analytics")
3940
public class AnalyticsServlet extends HttpServlet {

‎appengine-java8/appidentity/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<properties>
3131
<maven.compiler.target>1.8</maven.compiler.target>
3232
<maven.compiler.source>1.8</maven.compiler.source>
33-
<appengine.sdk.version>1.9.52</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.54</appengine.sdk.version>
3434
</properties>
3535

3636
<dependencies>
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.json</groupId>
5151
<artifactId>json</artifactId>
52-
<version>20160810</version>
52+
<version>20170516</version>
5353
</dependency>
5454

5555
<dependency>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>com.google.truth</groupId>
9797
<artifactId>truth</artifactId>
98-
<version>0.32</version>
98+
<version>0.33</version>
9999
<scope>test</scope>
100100
</dependency>
101101
</dependencies>

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import javax.servlet.http.HttpServletResponse;
2727

2828
@SuppressWarnings("serial")
29+
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
2930
@WebServlet(name = "appidentity", description = "AppIdentity: Get the Host Name",
3031
urlPatterns = "/appidentity/identity")
3132
public class IdentityServlet extends HttpServlet {

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import javax.servlet.http.HttpServletResponse;
4343

4444
@SuppressWarnings("serial")
45+
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
4546
@WebServlet(name = "signforapp", description = "AppIdentity: Sign 'abcdefg'",
4647
urlPatterns = "/appidentity/sign")
4748
public class SignForAppServlet extends HttpServlet {

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import javax.servlet.http.HttpServletResponse;
2626

2727
@SuppressWarnings("serial")
28+
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
2829
@WebServlet(name = "UrlShortener", description = "AppIdentity: Url Shortener",
2930
urlPatterns = "/appidentity/shorten")
3031
public class UrlShortenerServlet extends HttpServlet {

‎appengine-java8/cloudsql/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<database>sqldemo</database>
4141

4242
<!-- [START_EXCLUDE] -->
43-
<appengine.maven.plugin>1.3.1</appengine.maven.plugin>
4443
<maven.compiler.target>1.8</maven.compiler.target>
4544
<maven.compiler.source>1.8</maven.compiler.source>
4645
<!-- [END_EXCLUDE] -->
@@ -51,7 +50,7 @@
5150
<dependency>
5251
<groupId>com.google.appengine</groupId>
5352
<artifactId>appengine-api-1.0-sdk</artifactId>
54-
<version>${appengine.sdk.version}</version>
53+
<version>1.9.54</version>
5554
</dependency>
5655

5756
<dependency>
@@ -72,7 +71,7 @@
7271
<dependency>
7372
<groupId>mysql</groupId>
7473
<artifactId>mysql-connector-java</artifactId>
75-
<version>5.1.40</version> <!-- v5.x.x is for production, v6.x.x EAP X DevAPI and Java 8 -->
74+
<version>5.1.42</version> <!-- v5.x.x is for production, v6.x.x EAP X DevAPI -->
7675
<!--<version>6.0.6</version>-->
7776
</dependency>
7877
<dependency>
@@ -105,7 +104,7 @@
105104
<plugin>
106105
<groupId>com.google.cloud.tools</groupId>
107106
<artifactId>appengine-maven-plugin</artifactId>
108-
<version>${appengine.maven.plugin}</version>
107+
<version>1.3.1</version>
109108
<configuration>
110109
<deploy.promote>true</deploy.promote>
111110
<deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>

‎appengine-java8/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
// [START example]
3939
@SuppressWarnings("serial")
40+
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
4041
@WebServlet(name = "CloudSQL", description = "CloudSQL: Write low order IP address to Cloud SQL",
4142
urlPatterns = "/cloudsql")
4243
public class CloudSqlServlet extends HttpServlet {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>com.google.truth</groupId>
7777
<artifactId>truth</artifactId>
78-
<version>0.32</version>
78+
<version>0.33</version>
7979
<scope>test</scope>
8080
</dependency>
8181
</dependencies>

0 commit comments

Comments
 (0)