From 66fc6da8722129e52d825789f5df02335f3bc4b9 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@users.noreply.github.com>
Date: Wed, 31 Aug 2016 15:48:30 -0700
Subject: [PATCH] New plugin (#319)

* update hello world for new gradle & maven plugins
1. add license & tags to app.yaml
2. fix some versions and naming in the pom.xml
3. add tags to pom.xml
4. remove a blank line from build.gradle
---
 managed_vms/helloworld/build.gradle               |  1 -
 managed_vms/helloworld/pom.xml                    | 13 ++++++++-----
 .../helloworld/src/main/appengine/app.yaml        | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/managed_vms/helloworld/build.gradle b/managed_vms/helloworld/build.gradle
index 484eaa30b9b..d0651329753 100644
--- a/managed_vms/helloworld/build.gradle
+++ b/managed_vms/helloworld/build.gradle
@@ -56,7 +56,6 @@ model {
       stopPreviousVersion = true  // default - stop the current version
       promote = true              // default - & make this the current version
     }
-
   }
 }
 // [END model]
diff --git a/managed_vms/helloworld/pom.xml b/managed_vms/helloworld/pom.xml
index aa8ef5943e7..31c366ccc02 100644
--- a/managed_vms/helloworld/pom.xml
+++ b/managed_vms/helloworld/pom.xml
@@ -13,12 +13,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<!-- [START project] -->
 <project>
   <modelVersion>4.0.0</modelVersion>
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
-  <groupId>com.example.managedvms</groupId>
-  <artifactId>managed-vms-helloworld</artifactId>
+  <groupId>com.example.flexible</groupId>
+  <artifactId>flexible-helloworld</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -28,11 +29,12 @@
   </parent>
 
   <properties>
-    <maven.compiler.target>1.7</maven.compiler.target>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven-war-plugin-version>2.6</maven-war-plugin-version>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+
     <appengine.maven.plugin>0.1.1-beta</appengine.maven.plugin>
     <jetty-maven-plugin-version>9.3.7.v20160115</jetty-maven-plugin-version>
+
     <failOnMissingWebXml>false</failOnMissingWebXml>
   </properties>
 
@@ -75,3 +77,4 @@
     </plugins>
   </build>
 </project>
+<!-- [END project] -->
diff --git a/managed_vms/helloworld/src/main/appengine/app.yaml b/managed_vms/helloworld/src/main/appengine/app.yaml
index 2a659160df5..b37fa66a82e 100644
--- a/managed_vms/helloworld/src/main/appengine/app.yaml
+++ b/managed_vms/helloworld/src/main/appengine/app.yaml
@@ -1,3 +1,17 @@
+#  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.
+# [START appyaml]
 runtime: java
 vm: true
 
@@ -5,3 +19,4 @@ handlers:
 - url: /.*
   script: this field is required, but ignored
   secure: always
+# [END appyaml]