Skip to content

Commit 69f3a61

Browse files
tswasttswast
committed
Update App Engine SDK version.
Fixed a few straggler POMs that were not getting the App Engine version from the parent POM.
1 parent abe632e commit 69f3a61

File tree

3 files changed

+25
-39
lines changed

3 files changed

+25
-39
lines changed

‎appengine/appidentity/pom.xml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<!--
3-
Copyright 2015 Google Inc. All Rights Reserved.
2+
Copyright 2015 Google Inc. All Rights Reserved.
43
54
Licensed under the Apache License, Version 2.0 (the "License");
65
you may not use this file except in compliance with the License.
@@ -14,8 +13,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
1413
See the License for the specific language governing permissions and
1514
limitations under the License.
1615
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project>
1917
<modelVersion>4.0.0</modelVersion>
2018
<packaging>war</packaging>
2119
<version>1.0-SNAPSHOT</version>
@@ -29,16 +27,11 @@ Copyright 2015 Google Inc. All Rights Reserved.
2927
<relativePath>../..</relativePath>
3028
</parent>
3129

32-
<properties>
33-
<appengine.target.version>1.9.30</appengine.target.version>
34-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35-
</properties>
36-
3730
<dependencies>
3831
<dependency>
3932
<groupId>com.google.appengine</groupId>
4033
<artifactId>appengine-api-1.0-sdk</artifactId>
41-
<version>${appengine.target.version}</version>
34+
<version>${appengine.sdk.version}</version>
4235
</dependency>
4336
<dependency>
4437
<groupId>com.google.guava</groupId>
@@ -74,19 +67,19 @@ Copyright 2015 Google Inc. All Rights Reserved.
7467
<dependency>
7568
<groupId>com.google.appengine</groupId>
7669
<artifactId>appengine-testing</artifactId>
77-
<version>${appengine.target.version}</version>
70+
<version>${appengine.sdk.version}</version>
7871
<scope>test</scope>
7972
</dependency>
8073
<dependency>
8174
<groupId>com.google.appengine</groupId>
8275
<artifactId>appengine-api-stubs</artifactId>
83-
<version>${appengine.target.version}</version>
76+
<version>${appengine.sdk.version}</version>
8477
<scope>test</scope>
8578
</dependency>
8679
<dependency>
8780
<groupId>com.google.appengine</groupId>
8881
<artifactId>appengine-tools-sdk</artifactId>
89-
<version>${appengine.target.version}</version>
82+
<version>${appengine.sdk.version}</version>
9083
<scope>test</scope>
9184
</dependency>
9285
<dependency>
@@ -100,15 +93,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
10093
<!-- for hot reload of the web application -->
10194
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
10295
<plugins>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<version>3.3</version>
106-
<artifactId>maven-compiler-plugin</artifactId>
107-
<configuration>
108-
<source>1.7</source>
109-
<target>1.7</target>
110-
</configuration>
111-
</plugin>
11296
<plugin>
11397
<groupId>com.google.appengine</groupId>
11498
<artifactId>gcloud-maven-plugin</artifactId>

‎appengine/mailgun/pom.xml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<!--
3-
Copyright 2015 Google Inc. All Rights Reserved.
2+
Copyright 2015 Google Inc. All Rights Reserved.
43
54
Licensed under the Apache License, Version 2.0 (the "License");
65
you may not use this file except in compliance with the License.
@@ -14,8 +13,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
1413
See the License for the specific language governing permissions and
1514
limitations under the License.
1615
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project>
1917
<modelVersion>4.0.0</modelVersion>
2018
<packaging>war</packaging>
2119
<version>1.0-SNAPSHOT</version>
@@ -57,19 +55,10 @@ Copyright 2015 Google Inc. All Rights Reserved.
5755
<!-- for hot reload of the web application -->
5856
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
5957
<plugins>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<version>3.3</version>
63-
<artifactId>maven-compiler-plugin</artifactId>
64-
<configuration>
65-
<source>1.7</source>
66-
<target>1.7</target>
67-
</configuration>
68-
</plugin>
6958
<plugin>
7059
<groupId>com.google.appengine</groupId>
7160
<artifactId>appengine-maven-plugin</artifactId>
72-
<version>1.9.31</version>
61+
<version>${appengine.sdk.version}</version>
7362
</plugin>
7463
</plugins>
7564
</build>

‎pom.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<!--
2+
Copyright 2016 Google Inc. All Rights Reserved.
33
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<project>
417
<modelVersion>4.0.0</modelVersion>
518
<version>1.0.0</version>
619

@@ -9,7 +22,7 @@
922
<packaging>pom</packaging>
1023

1124
<properties>
12-
<appengine.sdk.version>1.9.32</appengine.sdk.version>
25+
<appengine.sdk.version>1.9.34</appengine.sdk.version>
1326
<appengine.app.version>1</appengine.app.version>
1427
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1528
<project.http.version>1.19.0</project.http.version>

0 commit comments

Comments
 (0)