svn commit: r1756259 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugins/war/AbstractWarMojo.java main/java/org/apache/maven/plugins/war/WarMojo.java test/java/org/apache/maven/plugins/war/WarMojoTest.java

[khmarbaise]

Author: khmarbaise
Date: Sat Aug 13 12:50:47 2016
New Revision: 1756259

URL: http://svn.apache.org/viewvc?rev=1756259&view=rev
Log:
Removed hard coded defaults from parameters, cause 
they will set by injection.

Modified:
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java
    
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java?rev=1756259&r1=1756258&r2=1756259&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
 Sat Aug 13 12:50:47 2016
@@ -283,7 +283,7 @@ public abstract class AbstractWarMojo
      * @since 2.1-alpha-2
      */
     @Parameter( defaultValue = "false" )
-    private boolean filteringDeploymentDescriptors = false;
+    private boolean filteringDeploymentDescriptors;
 
     /**
      * To escape interpolated values with Windows path <code>c:\foo\bar</code> 
will be replaced with
@@ -292,7 +292,7 @@ public abstract class AbstractWarMojo
      * @since 2.1-alpha-2
      */
     @Parameter( defaultValue = "false" )
-    private boolean escapedBackslashesInFilePath = false;
+    private boolean escapedBackslashesInFilePath;
 
     /**
      * Expression preceded with this String won't be interpolated. 
<code>\${foo}</code> will be replaced with
@@ -324,7 +324,7 @@ public abstract class AbstractWarMojo
      * @since 2.4
      */
     @Parameter( defaultValue = "false" )
-    private boolean supportMultiLineFiltering = false;
+    private boolean supportMultiLineFiltering;
 
     /**
      * use jvmChmod rather that cli chmod and forking process

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java?rev=1756259&r1=1756258&r2=1756259&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java
 Sat Aug 13 12:50:47 2016
@@ -109,7 +109,7 @@ public class WarMojo
      * it to the local repository instead of the default one in an execution.
      */
     @Parameter( defaultValue = "true" )
-    private boolean primaryArtifact = true;
+    private boolean primaryArtifact;
 
     /**
      * Whether or not to fail the build if the <code>web.xml</code> file is 
missing. Set to <code>false</code> if you
@@ -119,7 +119,7 @@ public class WarMojo
      * @since 2.1-alpha-2
      */
     @Parameter( defaultValue = "true" )
-    private boolean failOnMissingWebXml = true;
+    private boolean failOnMissingWebXml;
 
     /**
      * Whether classes (that is the content of the WEB-INF/classes directory) 
should be attached to the project as an
@@ -144,7 +144,7 @@ public class WarMojo
      * @since 2.1-alpha-2
      */
     @Parameter( defaultValue = "false" )
-    private boolean attachClasses = false;
+    private boolean attachClasses;
 
     /**
      * The classifier to use for the attached classes artifact.
@@ -152,7 +152,7 @@ public class WarMojo
      * @since 2.1-alpha-2
      */
     @Parameter( defaultValue = "classes" )
-    private String classesClassifier = "classes";
+    private String classesClassifier;
 
     /**
      * You can skip the execution of the plugin if you need to. Its use is NOT 
RECOMMENDED, but quite convenient on

Modified: 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java?rev=1756259&r1=1756258&r2=1756259&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
 Sat Aug 13 12:50:47 2016
@@ -373,6 +373,7 @@ public class WarMojoTest
         setVariableValueToObject( mojo, "warName", warName );
         mojo.setWebXml( new File( xmlSource, "web.xml" ) );
         mojo.setAttachClasses( true );
+        mojo.setClassesClassifier( "classes" );
 
         mojo.execute();