Skip to content

Commit 3c18908

Browse files
author
Shun Fan
committed
Merge pull request #69 from GoogleCloudPlatform/java8
Update to java8
2 parents 7d0e80d + 86ec40a commit 3c18908

File tree

54 files changed

+249
-573
lines changed

Some content is hidden

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

54 files changed

+249
-573
lines changed

‎managed_vms/analytics/pom.xml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
<!-- for hot reload of the web application -->
2525
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
2626
<plugins>
27+
<plugin>
28+
<groupId>com.google.appengine</groupId>
29+
<artifactId>gcloud-maven-plugin</artifactId>
30+
<version>2.0.9.92.v20160118</version>
31+
<configuration>
32+
<promote>true</promote>
33+
</configuration>
34+
</plugin>
2735
<plugin>
2836
<groupId>org.apache.maven.plugins</groupId>
2937
<artifactId>maven-war-plugin</artifactId>
@@ -37,16 +45,8 @@
3745
<version>3.3</version>
3846
<artifactId>maven-compiler-plugin</artifactId>
3947
<configuration>
40-
<source>1.7</source>
41-
<target>1.7</target>
42-
</configuration>
43-
</plugin>
44-
<plugin>
45-
<groupId>com.google.appengine</groupId>
46-
<artifactId>gcloud-maven-plugin</artifactId>
47-
<version>2.0.9.90.v20151210</version>
48-
<configuration>
49-
<promote>true</promote>
48+
<source>1.8</source>
49+
<target>1.8</target>
5050
</configuration>
5151
</plugin>
5252
<plugin>
@@ -63,6 +63,11 @@
6363
<execution><goals><goal>check</goal></goals></execution>
6464
</executions>
6565
</plugin>
66+
<plugin>
67+
<groupId>org.eclipse.jetty</groupId>
68+
<artifactId>jetty-maven-plugin</artifactId>
69+
<version>9.3.7.v20160115</version>
70+
</plugin>
6671
</plugins>
6772
</build>
6873
</project>

‎managed_vms/analytics/src/main/appengine/app.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
runtime: java
2+
vm: true
3+
4+
# [START env_variables]
5+
env_variables:
6+
GA_TRACKING_ID: YOUR-GA-TRACKING-ID
7+
# [END env_variables]

‎managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
// [START example]
3535
@SuppressWarnings("serial")
36-
@WebServlet(name = "analytics", value = "/*")
36+
@WebServlet(name = "analytics", value = "")
3737
public class AnalyticsServlet extends HttpServlet {
3838

3939
@Override

‎managed_vms/analytics/src/main/webapp/WEB-INF/appengine-web.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎managed_vms/cloudsql/pom.xml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
<!-- for hot reload of the web application -->
2727
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
2828
<plugins>
29+
<plugin>
30+
<groupId>com.google.appengine</groupId>
31+
<artifactId>gcloud-maven-plugin</artifactId>
32+
<version>2.0.9.92.v20160118</version>
33+
<configuration>
34+
<promote>true</promote>
35+
</configuration>
36+
</plugin>
2937
<plugin>
3038
<groupId>org.apache.maven.plugins</groupId>
3139
<artifactId>maven-war-plugin</artifactId>
@@ -39,16 +47,8 @@
3947
<artifactId>maven-compiler-plugin</artifactId>
4048
<version>3.3</version>
4149
<configuration>
42-
<source>1.7</source>
43-
<target>1.7</target>
44-
</configuration>
45-
</plugin>
46-
<plugin>
47-
<groupId>com.google.appengine</groupId>
48-
<artifactId>gcloud-maven-plugin</artifactId>
49-
<version>2.0.9.90.v20151210</version>
50-
<configuration>
51-
<promote>true</promote>
50+
<source>1.8</source>
51+
<target>1.8</target>
5252
</configuration>
5353
</plugin>
5454
<plugin>
@@ -65,6 +65,11 @@
6565
<execution><goals><goal>check</goal></goals></execution>
6666
</executions>
6767
</plugin>
68+
<plugin>
69+
<groupId>org.eclipse.jetty</groupId>
70+
<artifactId>jetty-maven-plugin</artifactId>
71+
<version>9.3.7.v20160115</version>
72+
</plugin>
6873
</plugins>
6974
</build>
7075
</project>

‎managed_vms/cloudsql/src/main/appengine/app.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
runtime: java
2+
vm: true
3+
4+
# [START env_variables]
5+
env_variables:
6+
SQL_DATABASE_URL: jdbc:mysql://HOST-IP:3306/YOUR-DB-NAME?user=USERNAME&password=PASSWORD
7+
# [END env_variables]

‎managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java‎

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

3535
// [START example]
3636
@SuppressWarnings("serial")
37-
@WebServlet(name = "cloudsql", value = "/*")
37+
@WebServlet(name = "cloudsql", value = "")
3838
public class CloudSqlServlet extends HttpServlet {
3939

4040
@Override

‎managed_vms/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎managed_vms/cloudstorage/pom.xml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,22 @@
1818
<dependency>
1919
<groupId>com.google.gcloud</groupId>
2020
<artifactId>gcloud-java-storage</artifactId>
21-
<version>0.1.1</version>
21+
<version>0.1.3</version>
2222
</dependency>
2323
<!-- [END dependencies] -->
2424
</dependencies>
2525
<build>
2626
<!-- for hot reload of the web application -->
2727
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
2828
<plugins>
29+
<plugin>
30+
<groupId>com.google.appengine</groupId>
31+
<artifactId>gcloud-maven-plugin</artifactId>
32+
<version>2.0.9.92.v20160118</version>
33+
<configuration>
34+
<promote>true</promote>
35+
</configuration>
36+
</plugin>
2937
<plugin>
3038
<groupId>org.apache.maven.plugins</groupId>
3139
<artifactId>maven-war-plugin</artifactId>
@@ -39,16 +47,8 @@
3947
<artifactId>maven-compiler-plugin</artifactId>
4048
<version>3.3</version>
4149
<configuration>
42-
<source>1.7</source>
43-
<target>1.7</target>
44-
</configuration>
45-
</plugin>
46-
<plugin>
47-
<groupId>com.google.appengine</groupId>
48-
<artifactId>gcloud-maven-plugin</artifactId>
49-
<version>2.0.9.90.v20151210</version>
50-
<configuration>
51-
<promote>true</promote>
50+
<source>1.8</source>
51+
<target>1.8</target>
5252
</configuration>
5353
</plugin>
5454
<plugin>
@@ -65,6 +65,11 @@
6565
<execution><goals><goal>check</goal></goals></execution>
6666
</executions>
6767
</plugin>
68+
<plugin>
69+
<groupId>org.eclipse.jetty</groupId>
70+
<artifactId>jetty-maven-plugin</artifactId>
71+
<version>9.3.7.v20160115</version>
72+
</plugin>
6873
</plugins>
6974
</build>
7075
</project>

‎managed_vms/cloudstorage/src/main/appengine/app.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
runtime: java
2+
vm: true
3+
4+
# [START env_variables]
5+
env_variables:
6+
BUCKET_NAME: YOUR-BUCKET-NAME
7+
# [END env_variables]

0 commit comments

Comments
 (0)