svn commit: r1190513 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/never-fail-test/pom.xml main/java/org/apache/maven/plugin/antrun/AntRunMojo.java

[bi...@apache.org]

Author: bimargulies
Date: Fri Oct 28 19:22:19 2011
New Revision: 1190513

URL: http://svn.apache.org/viewvc?rev=1190513&view=rev
Log:
[MANTRUN-170] Allow antrun to avoid failing the build

o fix name of parameter to match everyone else (failOnError)

Modified:
    maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml
    maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java

Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml?rev=1190513&r1=1190512&r2=1190513&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml Fri Oct 28 19:22:19 2011
@@ -37,7 +37,7 @@ under the License.
         <artifactId>maven-antrun-plugin</artifactId>
         <version>@pom.version@</version>
         <configuration>
-	  <neverFail>true</neverFail>
+	  <failOnError>false</failOnError>
           <tasks>
 	    <fail>This is a failure</fail>
           </tasks>

Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1190513&r1=1190512&r2=1190513&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Fri Oct 28 19:22:19 2011
@@ -221,10 +221,10 @@ public class AntRunMojo
      * If this value is 'true', the Maven build will proceed even if the ant build fails.
      * If it is 'false', then the Maven build fails if the ant build fails.
      * 
-     * @parameter default-value="false"
+     * @parameter default-value="true"
      * @since 1.7
      */
-    private boolean neverFail;
+    private boolean failOnError;
 
     /**
      * @see org.apache.maven.plugin.Mojo#execute()
@@ -346,7 +346,7 @@ public class AntRunMojo
             {
                 sb.append( "\n" ).append( fragment );
             }
-            if ( neverFail) 
+            if ( !failOnError ) 
             {
                 getLog().info( sb.toString(), e );
                 return; // do not register roots.