From 5e8ac6ea1a494549e00481bb89bcece78c8313d3 Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Wed, 23 May 2018 17:12:02 +0800
Subject: [PATCH] change default deployment type from war to ftp

---
 azure-webapp-maven-plugin/README.md                         | 2 +-
 azure-webapp-maven-plugin/pom.xml                           | 4 ++--
 .../microsoft/azure/maven/webapp/AbstractWebAppMojo.java    | 2 +-
 .../azure/maven/webapp/handlers/HandlerFactoryImpl.java     | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/azure-webapp-maven-plugin/README.md b/azure-webapp-maven-plugin/README.md
index a83b5ef1e9..b51262ed37 100644
--- a/azure-webapp-maven-plugin/README.md
+++ b/azure-webapp-maven-plugin/README.md
@@ -90,7 +90,7 @@ Property | Required | Description | Version
 `<containerSettings>` | false | Specifies the docker container image to deploy to your Web App.<br>This setting is only applicable for Web App for Containers. Docker hubs and private container registries are both supported; see the [Container Setting](#container-setting) section of this README for details. | 0.1.0+
 `<appSettings>` | false | Specifies the application settings for your Web App, which are defined in name-value pairs like following example:<br>`<property>`<br>&nbsp;&nbsp;&nbsp;&nbsp;`<name>xxxx</name>`<br>&nbsp;&nbsp;&nbsp;&nbsp;`<value>xxxx</value>`<br>`</property>` | 0.1.0+
 `<stopAppDuringDeployment>` | false | Specifies whether stop target Web App during deployment. This will prevent deployment failure caused by IIS locking files. | 0.1.4+
-`<deploymentType>` | false | Specifies the deployment approach you want to use, available options: <br><ul><li>war (by default): since 1.1.0</li><li>ftp: since 0.1.0</li></ul> | 0.1.0+
+`<deploymentType>` | false | Specifies the deployment approach you want to use, available options: <br><ul><li>ftp (by default): since 0.1.0</li><li>war: since 1.1.0</li></ul> | 0.1.0+
 `<resources>` | false | Specifies the artifacts to be deployed to your Web App when `<deploymentType>` is set to `ftp`.<br>See the [Deploy via FTP](#deploy-via-ftp) section for more details. | 0.1.0+
 `<warFile>` | false | Specifies the location of the war file which is to be deployed when `<deploymentType>` is set to `war`.<br>If this configuration is not specified, plugin will find the war file according to the `finalName` in the project build directory. | 1.1.0+
 `<path>` | false | Specify the context path for the deployment when `<deploymentType>` is set to `war`.<br>If this configuration is not specified, plugin will deploy to the context path: `/`, which is also known as the `ROOT`. | 1.1.0+
diff --git a/azure-webapp-maven-plugin/pom.xml b/azure-webapp-maven-plugin/pom.xml
index 47c739fa77..1e5cbad19a 100644
--- a/azure-webapp-maven-plugin/pom.xml
+++ b/azure-webapp-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-webapp-maven-plugin</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
     <name>Maven Plugin for Azure Web Apps</name>
     <description>Maven Plugin for Azure Web Apps</description>
@@ -22,7 +22,7 @@
         <maven.plugin-testing.version>3.3.0</maven.plugin-testing.version>
         <codehaus.plexus-utils.version>3.0.20</codehaus.plexus-utils.version>
         <azure.ai.version>1.0.9</azure.ai.version>
-        <azure.maven-plugin-lib.version>1.0.0-SNAPSHOT</azure.maven-plugin-lib.version>
+        <azure.maven-plugin-lib.version>1.0.0</azure.maven-plugin-lib.version>
         <junit.version>4.12</junit.version>
         <mockito.version>2.4.0</mockito.version>
         <spring-test.version>4.1.6.RELEASE</spring-test.version>
diff --git a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/AbstractWebAppMojo.java b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/AbstractWebAppMojo.java
index 3a9de78fc4..1e4bc29ee8 100644
--- a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/AbstractWebAppMojo.java
+++ b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/AbstractWebAppMojo.java
@@ -192,7 +192,7 @@ public abstract class AbstractWebAppMojo extends AbstractAzureMojo {
      *
      * @since 0.1.0
      */
-    @Parameter(property = "webapp.deploymentType", defaultValue = "war")
+    @Parameter(property = "webapp.deploymentType", defaultValue = "ftp")
     protected String deploymentType;
 
     /**
diff --git a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/HandlerFactoryImpl.java b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/HandlerFactoryImpl.java
index 38763c315b..aa6f182a66 100644
--- a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/HandlerFactoryImpl.java
+++ b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/HandlerFactoryImpl.java
@@ -73,11 +73,11 @@ public ArtifactHandler getArtifactHandler(final AbstractWebAppMojo mojo) throws
                 throw new MojoExecutionException(DEPLOYMENT_TYPE_NOT_FOUND);
             case UNKNOWN:
                 throw new MojoExecutionException(UNKNOWN_DEPLOYMENT_TYPE);
-            case FTP:
-                return new FTPArtifactHandlerImpl(mojo);
             case WAR:
-            default:
                 return new WarArtifactHandlerImpl(mojo);
+            case FTP:
+            default:
+                return new FTPArtifactHandlerImpl(mojo);
         }
     }