commit 0a9d11a1310bebb7c2707ebd82ee8bff04ec014b
author Karl Heinz Marbaise <khmarbaise@apache.org> Mon May 16 14:56:42 2016 +0000
committer Karl Heinz Marbaise <khmarbaise@apache.org> Mon May 16 14:56:42 2016 +0000
tree 427d9f76dac6b6e6fc4075e837cc42b63839ab43
parent 29cf084fae145d09d783c0e697036b518277813e

[MWAR-376] Remove param properties that doesn't make sense for CLI usage
  o Removed the following properties:
    archiveClasses, resourceEncoding, maven.war.webxml, maven.war.containerConfigXML,
    useCache, includes, excludes, maven.war.filteringDeploymentDescriptors, 
    maven.war.escapedBackslashesInFilePath, maven.war.escapeString, 
    maven.war.supportMultiLineFiltering, maven.war.useJvmChmod, primaryArtifact, 
    failOnMissingWebXml.


git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1744063 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java

diff --git a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
index 20cb075..6a345bf 100644
--- a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
@@ -90,7 +90,7 @@
      *
      * @since 2.0.1
      */
-    @Parameter( property = "archiveClasses", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean archiveClasses;
 
     /**
@@ -98,7 +98,7 @@
      *
      * @since 2.3
      */
-    @Parameter( property = "resourceEncoding", defaultValue = "${project.build.sourceEncoding}" )
+    @Parameter( defaultValue = "${project.build.sourceEncoding}" )
     private String resourceEncoding;
 
     /**
@@ -166,7 +166,7 @@
     /**
      * The path to the web.xml file to use.
      */
-    @Parameter( property = "maven.war.webxml" )
+    @Parameter
     private File webXml;
 
     /**
@@ -174,7 +174,7 @@
      * different servlet containers. Apache Tomcat uses a configuration file named context.xml. The file will be copied
      * to the META-INF directory.
      */
-    @Parameter( property = "maven.war.containerConfigXML" )
+    @Parameter
     private File containerConfigXML;
 
     /**
@@ -206,7 +206,7 @@
      *
      * @since 2.1-alpha-1
      */
-    @Parameter( property = "useCache", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean useCache = false;
 
     /**
@@ -233,13 +233,13 @@
     /**
      * The comma separated list of tokens to include when copying the content of the warSourceDirectory.
      */
-    @Parameter( alias = "includes", defaultValue = "**" )
+    @Parameter( defaultValue = "**" )
     private String warSourceIncludes;
 
     /**
      * The comma separated list of tokens to exclude when copying the content of the warSourceDirectory.
      */
-    @Parameter( alias = "excludes" )
+    @Parameter
     private String warSourceExcludes;
 
     /**
@@ -282,7 +282,7 @@
      *
      * @since 2.1-alpha-2
      */
-    @Parameter( property = "maven.war.filteringDeploymentDescriptors", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean filteringDeploymentDescriptors = false;
 
     /**
@@ -291,7 +291,7 @@
      *
      * @since 2.1-alpha-2
      */
-    @Parameter( property = "maven.war.escapedBackslashesInFilePath", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean escapedBackslashesInFilePath = false;
 
     /**
@@ -300,7 +300,7 @@
      *
      * @since 2.1-beta-1
      */
-    @Parameter( property = "maven.war.escapeString" )
+    @Parameter
     protected String escapeString;
 
     /**
@@ -323,7 +323,7 @@
      *
      * @since 2.4
      */
-    @Parameter( property = "maven.war.supportMultiLineFiltering", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean supportMultiLineFiltering = false;
 
     /**
@@ -331,7 +331,7 @@
      *
      * @since 2.4
      */
-    @Parameter( property = "maven.war.useJvmChmod", defaultValue = "true" )
+    @Parameter( defaultValue = "true" )
     private boolean useJvmChmod;
 
     /**

src/main/java/org/apache/maven/plugins/war/WarMojo.java

diff --git a/src/main/java/org/apache/maven/plugins/war/WarMojo.java b/src/main/java/org/apache/maven/plugins/war/WarMojo.java
index 8a7158d..5a60370 100644
--- a/src/main/java/org/apache/maven/plugins/war/WarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarMojo.java
@@ -108,7 +108,7 @@
      * Whether this is the main artifact being built. Set to <code>false</code> if you don't want to install or deploy
      * it to the local repository instead of the default one in an execution.
      */
-    @Parameter( property = "primaryArtifact", defaultValue = "true" )
+    @Parameter( defaultValue = "true" )
     private boolean primaryArtifact = true;
 
     /**
@@ -118,7 +118,7 @@
      *
      * @since 2.1-alpha-2
      */
-    @Parameter( property = "failOnMissingWebXml", defaultValue = "true" )
+    @Parameter( defaultValue = "true" )
     private boolean failOnMissingWebXml = true;
 
     /**