Skip to content
This repository was archived by the owner on Nov 9, 2023. It is now read-only.

Commit 14205c3

Browse files
committed
Update to new endpoints framework
App engine no longer supports endpoints framework v1, so migrating to endpoints framework v2.
1 parent cee69ab commit 14205c3

File tree

4 files changed

+323
-195
lines changed

4 files changed

+323
-195
lines changed

u2f-gae-demo/pom.xml

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<artifactId>u2f-gae-demo</artifactId>
66
<properties>
77
<appengine.app.version>1</appengine.app.version>
8-
<appengine.sdk.version>1.9.54</appengine.sdk.version>
8+
<appengine.sdk.version>1.9.64</appengine.sdk.version>
99
<objectify.version>5.1.5</objectify.version>
10-
<guava.version>18.0</guava.version>
10+
<guava.version>26.0-jre</guava.version>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
</properties>
13-
<version>0.0.1-SNAPSHOT</version>
13+
<version>0.0.2-SNAPSHOT</version>
1414
<packaging>war</packaging>
1515
<name>u2f-gae-demo</name>
1616
<description>u2f-gae-demo</description>
@@ -29,8 +29,8 @@
2929
<artifactId>maven-compiler-plugin</artifactId>
3030
<version>3.5.1</version>
3131
<configuration>
32-
<source>1.7</source>
33-
<target>1.7</target>
32+
<source>1.8</source>
33+
<target>1.8</target>
3434
</configuration>
3535
</plugin>
3636
<plugin>
@@ -89,15 +89,25 @@
8989
<configuration>
9090
<enableJarClasses>false</enableJarClasses>
9191
<port>8888</port>
92-
<!-- Comment in the below snippet to bind to all IPs instead of just localhost -->
92+
<!-- Comment in the below snippet to bind to all IPs instead of
93+
just localhost -->
9394
<!-- <address>0.0.0.0</address> -->
9495
<!-- <port>8080</port> -->
95-
<!-- Comment in the below snippet to enable local debugging with a remote
96-
debugger like those included with Eclipse or IntelliJ -->
96+
<!-- Comment in the below snippet to enable local debugging with
97+
a remote debugger like those included with Eclipse or IntelliJ -->
9798
<!-- jvmFlags> <jvmFlag>-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n</jvmFlag>
9899
</jvmFlags -->
99100
</configuration>
100101
</plugin>
102+
<plugin>
103+
<groupId>com.google.cloud.tools</groupId>
104+
<artifactId>endpoints-framework-maven-plugin</artifactId>
105+
<version>1.0.2</version>
106+
<configuration>
107+
<!-- plugin configuration -->
108+
<hostname>u2fdemo.appspot.com</hostname>
109+
</configuration>
110+
</plugin>
101111
</plugins>
102112
</build>
103113
<dependencies>
@@ -112,9 +122,19 @@
112122
<version>${appengine.sdk.version}</version>
113123
</dependency>
114124
<dependency>
115-
<groupId>com.google.appengine</groupId>
116-
<artifactId>appengine-endpoints</artifactId>
117-
<version>${appengine.sdk.version}</version>
125+
<groupId>com.google.endpoints</groupId>
126+
<artifactId>endpoints-framework-all</artifactId>
127+
<version>2.0.7</version>
128+
</dependency>
129+
<dependency>
130+
<groupId>com.google.endpoints</groupId>
131+
<artifactId>endpoints-management-control-appengine</artifactId>
132+
<version>1.0.4</version>
133+
</dependency>
134+
<dependency>
135+
<groupId>com.google.endpoints</groupId>
136+
<artifactId>endpoints-framework-auth</artifactId>
137+
<version>1.0.4</version>
118138
</dependency>
119139
<dependency>
120140
<groupId>com.google.template</groupId>

u2f-gae-demo/war/WEB-INF/appengine-web.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
Allows App Engine to send multiple requests to one instance in parallel:
2020
-->
2121
<threadsafe>true</threadsafe>
22+
<runtime>java8</runtime>
2223

2324
<!-- Configure java.util.logging -->
2425
<system-properties>

0 commit comments

Comments
 (0)