New plugin (GoogleCloudPlatform#319)

lesv · web-flow · commit 66fc6da87221 · 2016-08-31T15:48:30.000-07:00
* update hello world for new gradle &amp; maven plugins
1. add license &amp; 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
diff --git 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
@@ -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
@@ -1,7 +1,22 @@
+#  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
 
 handlers:
 - url: /.*
   script: this field is required, but ignored
   secure: always
+# [END appyaml]

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ model {`
`56`	`56`	`stopPreviousVersion = true // default - stop the current version`
`57`	`57`	`promote = true // default - & make this the current version`
`58`	`58`	`}`
`59`		`-`
`60`	`59`	`}`
`61`	`60`	`}`
`62`	`61`	`// [END model]`