From 599237b43e8bd238f0a23425614f9cd85b439405 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@google.com>
Date: Mon, 26 Sep 2016 15:18:43 -0700
Subject: [PATCH] No model for Gradle

1. Remove the model component for Gradle
2. update to latest maven plugin as well.
---
 appengine/helloworld-new-plugins/build.gradle | 32 +++++++++----------
 appengine/helloworld-new-plugins/pom.xml      |  3 +-
 managed_vms/helloworld/build.gradle           | 13 +++-----
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/appengine/helloworld-new-plugins/build.gradle b/appengine/helloworld-new-plugins/build.gradle
index d567b2e5825..777de4021a5 100644
--- a/appengine/helloworld-new-plugins/build.gradle
+++ b/appengine/helloworld-new-plugins/build.gradle
@@ -1,11 +1,11 @@
 // 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.
 //  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.
@@ -23,15 +23,15 @@ buildscript {    // Configuration for building
 }
 
 repositories {   // repositories for Jar's you access in your code
-  maven { 
+  maven {
     url 'https://maven-central.storage.googleapis.com'             // Google's mirror of Maven Central
-//   url 'https://oss.sonatype.org/content/repositories/snapshots' // SNAPSHOT Reposiotry (if needed)
+//   url 'https://oss.sonatype.org/content/repositories/snapshots' // SNAPSHOT Repository (if needed)
   }
   jcenter()
   mavenCentral()
 }
 
-apply plugin: 'java'                              // standard Java tasks 
+apply plugin: 'java'                              // standard Java tasks
 apply plugin: 'war'                               // standard Web Archive plugin
 apply plugin: 'com.google.cloud.tools.appengine'  // App Engine tasks
 
@@ -43,16 +43,14 @@ dependencies {
 }
 
 // [START model]
-model {
-  appengine {  // App Engine tasks configuration
-    run {      // local (dev_appserver) configuration (standard environments only)
-      port = 8080                 // default
-    }
+appengine {  // App Engine tasks configuration
+  run {      // local (dev_appserver) configuration (standard environments only)
+    port = 8080                 // default
+  }
 
-    deploy {   // deploy configuration
-      stopPreviousVersion = true  // default - stop the current version
-      promote = true              // default - & make this the current version
-    }
+  deploy {   // deploy configuration
+    stopPreviousVersion = true  // default - stop the current version
+    promote = true              // default - & make this the current version
   }
 }
 // [END model]
@@ -60,6 +58,6 @@ model {
 group = 'com.example.appengine'   // Generated output GroupId
 version = '1.0-SNAPSHOT'          // Version in generated output
 
-sourceCompatibility = JavaVersion.VERSION_1_7  // App Engine Standard uses Java 7
-targetCompatibility = JavaVersion.VERSION_1_7  // App Engine Standard uses Java 7
+sourceCompatibility = 1.7  // App Engine Standard uses Java 7
+targetCompatibility = 1.7  // App Engine Standard uses Java 7
 // [END gradle]
diff --git a/appengine/helloworld-new-plugins/pom.xml b/appengine/helloworld-new-plugins/pom.xml
index 30dadcb33cb..889ad91cf04 100644
--- a/appengine/helloworld-new-plugins/pom.xml
+++ b/appengine/helloworld-new-plugins/pom.xml
@@ -39,6 +39,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -52,7 +53,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>0.1.1-beta</version>
+        <version>0.1.2</version>
         <configuration>
           <!-- dev appserver configuration (standard environment only) -->
           <!--
diff --git a/managed_vms/helloworld/build.gradle b/managed_vms/helloworld/build.gradle
index d0651329753..c755997a2b1 100644
--- a/managed_vms/helloworld/build.gradle
+++ b/managed_vms/helloworld/build.gradle
@@ -1,11 +1,11 @@
 // 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.
@@ -49,20 +49,17 @@ gretty {
 // [END gretty]
 
 // [START model]
-model {
   appengine {
-
     deploy {   // deploy configuration
       stopPreviousVersion = true  // default - stop the current version
       promote = true              // default - & make this the current version
     }
   }
-}
 // [END model]
 
 group = 'com.example.appengine'   // Generated output GroupId
 version = '1.0-SNAPSHOT'          // Version in generated output
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 // [END gradle]