From 69f3a610c2042c7cdf8af7e0b647b21804b7a2d3 Mon Sep 17 00:00:00 2001 From: Tim Swast <swast@google.com> Date: Fri, 18 Mar 2016 08:44:28 -0700 Subject: [PATCH] Update App Engine SDK version. Fixed a few straggler POMs that were not getting the App Engine version from the parent POM. --- appengine/appidentity/pom.xml | 28 ++++++---------------------- appengine/mailgun/pom.xml | 17 +++-------------- pom.xml | 19 ++++++++++++++++--- 3 files changed, 25 insertions(+), 39 deletions(-) diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml index 6fb040069c8..6d2f40cf769 100644 --- a/appengine/appidentity/pom.xml +++ b/appengine/appidentity/pom.xml @@ -1,6 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2015 Google Inc. All Rights Reserved. + Copyright 2015 Google Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,8 +13,7 @@ Copyright 2015 Google Inc. All Rights Reserved. See the License for the specific language governing permissions and limitations under the License. --> -<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"> +<project> <modelVersion>4.0.0</modelVersion> <packaging>war</packaging> <version>1.0-SNAPSHOT</version> @@ -29,16 +27,11 @@ Copyright 2015 Google Inc. All Rights Reserved. <relativePath>../..</relativePath> </parent> - <properties> - <appengine.target.version>1.9.30</appengine.target.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <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>com.google.guava</groupId> @@ -74,19 +67,19 @@ Copyright 2015 Google Inc. All Rights Reserved. <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> <dependency> @@ -100,15 +93,6 @@ Copyright 2015 Google Inc. All Rights Reserved. <!-- for hot reload of the web application --> <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <version>3.3</version> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> <plugin> <groupId>com.google.appengine</groupId> <artifactId>gcloud-maven-plugin</artifactId> diff --git a/appengine/mailgun/pom.xml b/appengine/mailgun/pom.xml index 77dc011713a..417bbb92225 100644 --- a/appengine/mailgun/pom.xml +++ b/appengine/mailgun/pom.xml @@ -1,6 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2015 Google Inc. All Rights Reserved. + Copyright 2015 Google Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,8 +13,7 @@ Copyright 2015 Google Inc. All Rights Reserved. See the License for the specific language governing permissions and limitations under the License. --> -<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"> +<project> <modelVersion>4.0.0</modelVersion> <packaging>war</packaging> <version>1.0-SNAPSHOT</version> @@ -57,19 +55,10 @@ Copyright 2015 Google Inc. All Rights Reserved. <!-- for hot reload of the web application --> <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <version>3.3</version> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> <plugin> <groupId>com.google.appengine</groupId> <artifactId>appengine-maven-plugin</artifactId> - <version>1.9.31</version> + <version>${appengine.sdk.version}</version> </plugin> </plugins> </build> diff --git a/pom.xml b/pom.xml index 2ffd5b6b4ff..7dcab2a0023 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> +<!-- + Copyright 2016 Google Inc. All Rights Reserved. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project> <modelVersion>4.0.0</modelVersion> <version>1.0.0</version> @@ -9,7 +22,7 @@ <packaging>pom</packaging> <properties> - <appengine.sdk.version>1.9.32</appengine.sdk.version> + <appengine.sdk.version>1.9.34</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>