Skip to content

Update App Engine SDK version. #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tswast merged 1 commit into from
Mar 4, 2016
Merged

Update App Engine SDK version. #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion appengine/helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
<version>1.0-SNAPSHOT</version>
<groupId>com.example.appengine</groupId>
<artifactId>appengine-helloworld</artifactId>
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
Expand Down Expand Up @@ -52,7 +53,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>1.9.31</version>
<version>${appengine.sdk.version}</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<packaging>pom</packaging>

<properties>
<appengine.sdk.version>1.9.19</appengine.sdk.version>
<appengine.sdk.version>1.9.32</appengine.sdk.version>
<appengine.app.version>1</appengine.app.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.http.version>1.19.0</project.http.version>
Expand Down
8 changes: 4 additions & 4 deletions storage/xml-api/serviceaccount-appengine-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
<parent>
<artifactId>doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
Expand All @@ -16,8 +17,7 @@
<packaging>war</packaging>

<properties>
<google-api-client.version>1.18.0-rc</google-api-client.version>
<project.appengine.version>1.8.3</project.appengine.version>
<google-api-client.version>1.21.0</google-api-client.version>
<webappDirectory>${project.build.directory}/${project.build.finalName}
</webappDirectory>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -76,7 +76,7 @@
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${project.appengine.version}</version>
<version>${appengine.sdk.version}</version>
<configuration>
<port>8888</port>
</configuration>
Expand All @@ -100,7 +100,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${project.appengine.version}</version>
<version>${appengine.sdk.version}</version>
</dependency>

<dependency>
Expand Down
9 changes: 2 additions & 7 deletions taskqueue/deferred/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>

<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
<parent>
<artifactId>doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
Expand All @@ -15,12 +16,6 @@
<groupId>com.google.cloud.taskqueue.samples</groupId>
<artifactId>taskqueue-defer-sample</artifactId>

<properties>
<appengine.version>1.9.19</appengine.version>
<appengine.app.version>1</appengine.app.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<!-- Compile/runtime dependencies -->
<dependency>
Expand Down Expand Up @@ -103,7 +98,7 @@
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>1.9.19</version>
<version>${appengine.sdk.version}</version>
<configuration>
<enableJarClasses>false</enableJarClasses>
<!-- Comment in the below snippet to bind to all IPs instead of just localhost -->
Expand Down
17 changes: 6 additions & 11 deletions unittests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>

<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
<parent>
<artifactId>doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
Expand All @@ -15,18 +16,12 @@
<groupId>com.google.appengine.samples</groupId>
<artifactId>unittests-appengine-local-testing-samples</artifactId>

<properties>
<appengine.app.version>1</appengine.app.version>
<appengine.target.version>1.8.4</appengine.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<!-- Compile/runtime dependencies -->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.target.version}</version>
<version>${appengine.sdk.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -48,19 +43,19 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>${appengine.target.version}</version>
<version>${appengine.sdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>${appengine.target.version}</version>
<version>${appengine.sdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>${appengine.target.version}</version>
<version>${appengine.sdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -97,7 +92,7 @@
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.target.version}</version>
<version>${appengine.sdk.version}</version>
</plugin>
</plugins>
</build>
Expand Down