Skip to content

Commit 61710f5

Browse files
author
Frank Natividad
committed
Updated Plugins to fix known bug and updated READMEs
1 parent 910aaf6 commit 61710f5

File tree

4 files changed

+7
-26
lines changed

4 files changed

+7
-26
lines changed

appengine/endpoints-frameworks-v2/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
This directory contains Google Cloud Endpoints Frameworks for App Engine for
44
App Engine Standard samples. The [`backend/`](backend/) directory contains the
55
sample code for the [quickstart][4] for Cloud Endpoints Frameworks on App Engine
6-
using an OpenAPI development process. The [`discovery/`](discovery/) directory
7-
contains the sample code for [migrated][2] prior version of [Cloud Endpoints
8-
Frameworks][1] project to the new [Cloud Endpoints Frameworks for App Engine][8]
9-
using a discovery document development process.
6+
using an OpenAPI development process. The [`migration-example/`](migration-example/) directory
7+
contains the sample code for a [migrated][2] version of the [Cloud Endpoints
8+
Frameworks][1] sample project to the new [Cloud Endpoints Frameworks for App Engine][8]
9+
development process.
1010

1111
The new Google Cloud Endpoints Frameworks for App Engine provides
1212
[additional functionality][3] using OpenAPI which may require payment.

appengine/endpoints-frameworks-v2/migration-example/README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@ provided [here][9].
9696
9797
`gradle appengineDeploy`
9898
99-
## Known issues
100-
101-
There's a [bug][13] where `<version>1</version>` is required in the
102-
[appengine-web.xml](src/main/webapp/WEB-INF/appengine-web.xml) to run
103-
this sample locally. This will become optional in the near future.
104-
10599
106100
[1]: https://cloud.google.com/appengine/docs/java/
107101
[2]: http://java.com/en/
@@ -115,4 +109,4 @@ this sample locally. This will become optional in the near future.
115109
[10]: https://github.com/GoogleCloudPlatform/endpoints-framework-maven-plugin
116110
[11]: https://github.com/GoogleCloudPlatform/endpoints-framework-gradle-plugin
117111
[12]: https://cloud.google.com/endpoints/docs/authenticating-users-frameworks
118-
[13]: https://github.com/cloudendpoints/endpoints-java/issues/43
112+

appengine/endpoints-frameworks-v2/migration-example/pom.xml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ limitations under the License.
3535
<appengine.endpoints.version>1.9.48</appengine.endpoints.version>
3636
-->
3737
<!-- End of Endpoints Frameworks v1.0 -->
38-
<appengine.maven.version>1.0.0</appengine.maven.version>
38+
<appengine.maven.version>1.2.0</appengine.maven.version>
3939
<endpoints.maven.plugin.version>1.0.0-beta2</endpoints.maven.plugin.version>
40-
<endpoints.framework.version>2.0.0-beta.12</endpoints.framework.version>
40+
<endpoints.framework.version>2.0.3</endpoints.framework.version>
4141
<javax.inject.version>1</javax.inject.version>
4242
<maven.compiler.source>1.7</maven.compiler.source>
4343
<maven.compiler.target>1.7</maven.compiler.target>
@@ -95,18 +95,6 @@ limitations under the License.
9595
<groupId>com.google.cloud.tools</groupId>
9696
<artifactId>endpoints-framework-maven-plugin</artifactId>
9797
<version>${endpoints.maven.plugin.version}</version>
98-
<configuration>
99-
<webappDir>src/main/webapp</webappDir>
100-
<discoveryDocDir>${project.build.directory}/generated-sources/appengine-endpoints/WEB-INF</discoveryDocDir>
101-
</configuration>
102-
<executions>
103-
<execution>
104-
<phase>generate-sources</phase>
105-
<goals>
106-
<goal>discoveryDocs</goal>
107-
</goals>
108-
</execution>
109-
</executions>
11098
</plugin>
11199
<plugin>
112100
<groupId>org.codehaus.mojo</groupId>

appengine/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
1818
<threadsafe>true</threadsafe>
19-
<version>1</version>
2019
<system-properties>
2120
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
2221
</system-properties>

0 commit comments

Comments
 (0)