You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/11/20 15:01:56 UTC
svn commit: r596676 - in /maven/plugins/trunk/maven-clean-plugin/src:
main/java/org/apache/maven/plugin/clean/ site/apt/examples/
test/resources/unit/basic-clean-test/ test/resources/unit/empty-clean-test/
test/resources/unit/fileset-clean-test/ test/r...
Author: vsiveton
Date: Tue Nov 20 06:01:55 2007
New Revision: 596676
URL: http://svn.apache.org/viewvc?rev=596676&view=rev
Log:
o using MNG-3294
o renamed ignoreErrors parameter to failOnError to be more consistent with other plugins
o updated doc and tests
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/basic-clean-test/plugin-pom.xml
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/empty-clean-test/plugin-pom.xml
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/invalid-directory-test/plugin-pom.xml
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/locked-file-test/plugin-pom.xml
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/missing-directory-test/plugin-pom.xml
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/nested-clean-test/plugin-pom.xml
Modified: maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java Tue Nov 20 06:01:55 2007
@@ -142,12 +142,12 @@
private boolean skip;
/**
- * Ignore exceptions or errors.
+ * Indicates whether the build will continue even if there are clean errors.
*
- * @parameter expression="${clean.ignore.errors}" default-value="false"
+ * @parameter expression="${maven.clean.failOnError}" default-value="true"
* @since 2.2
*/
- private boolean ignoreErrors;
+ private boolean failOnError;
/**
* Deletes file-sets in the following project build directory order:
@@ -179,7 +179,7 @@
}
catch ( MojoExecutionException e )
{
- if ( !ignoreErrors )
+ if ( failOnError )
{
throw e;
}
@@ -217,7 +217,7 @@
}
}
- fileSetManager.delete( fileset );
+ fileSetManager.delete( fileset, failOnError );
}
catch ( IOException e )
{
@@ -257,7 +257,7 @@
try
{
getLog().info( "Deleting directory " + dir.getAbsolutePath() );
- fileSetManager.delete( fs );
+ fileSetManager.delete( fs, failOnError );
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt Tue Nov 20 06:01:55 2007
@@ -28,7 +28,7 @@
Ignoring Clean Errors
- To ignore errors when running the cleanup for a particular project, set the ignoreErrors property to true.
+ To ignore errors when running the cleanup for a particular project, set the failOnError property to false.
+--------
<build>
@@ -36,7 +36,7 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
- <ignoreErrors>true</ignoreErrors>
+ <failOnError>false</failOnError>
</configuration>
</plugin>
[...]
@@ -46,5 +46,5 @@
You can also ignore them via command line by executing the following command:
+--------
-mvn clean -Dclean.ignore.errors=true
+mvn clean -Dmaven.clean.failOnError=false
+---------
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/basic-clean-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/basic-clean-test/plugin-pom.xml?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/basic-clean-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/basic-clean-test/plugin-pom.xml Tue Nov 20 06:01:55 2007
@@ -27,6 +27,8 @@
<directory>${basedir}/target/test-classes/unit/basic-clean-test/buildDirectory</directory>
<outputDirectory>${basedir}/target/test-classes/unit/basic-clean-test/buildOutputDirectory</outputDirectory>
<testOutputDirectory>${basedir}/target/test-classes/unit/basic-clean-test/buildTestDirectory</testOutputDirectory>
+ <verbose>true</verbose>
+ <failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/empty-clean-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/empty-clean-test/plugin-pom.xml?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/empty-clean-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/empty-clean-test/plugin-pom.xml Tue Nov 20 06:01:55 2007
@@ -24,6 +24,8 @@
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugin.clean.stubs.CleanProjectStub"/>
+ <verbose>true</verbose>
+ <failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml Tue Nov 20 06:01:55 2007
@@ -46,6 +46,7 @@
</fileset>
</filesets>
<verbose>true</verbose>
+ <failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/invalid-directory-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/invalid-directory-test/plugin-pom.xml?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/invalid-directory-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/invalid-directory-test/plugin-pom.xml Tue Nov 20 06:01:55 2007
@@ -25,6 +25,8 @@
<configuration>
<project implementation="org.apache.maven.plugin.clean.stubs.CleanProjectStub"/>
<directory>${basedir}/target/test-classes/unit/invalid-directory-test/this-is-a-file</directory>
+ <verbose>true</verbose>
+ <failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/locked-file-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/locked-file-test/plugin-pom.xml?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/locked-file-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/locked-file-test/plugin-pom.xml Tue Nov 20 06:01:55 2007
@@ -25,6 +25,8 @@
<configuration>
<project implementation="org.apache.maven.plugin.clean.stubs.CleanProjectStub"/>
<directory>${basedir}/target/test-classes/unit/locked-file-test/buildDirectory</directory>
+ <verbose>true</verbose>
+ <failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/missing-directory-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/missing-directory-test/plugin-pom.xml?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/missing-directory-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/missing-directory-test/plugin-pom.xml Tue Nov 20 06:01:55 2007
@@ -25,6 +25,8 @@
<configuration>
<project implementation="org.apache.maven.plugin.clean.stubs.CleanProjectStub"/>
<directory>${basedir}/target/test-classes/unit/missing-clean-test/does-not-exist</directory>
+ <verbose>true</verbose>
+ <failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/nested-clean-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/nested-clean-test/plugin-pom.xml?rev=596676&r1=596675&r2=596676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/nested-clean-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/nested-clean-test/plugin-pom.xml Tue Nov 20 06:01:55 2007
@@ -27,6 +27,8 @@
<directory>${basedir}/target/test-classes/unit/nested-clean-test/target</directory>
<outputDirectory>${basedir}/target/test-classes/unit/nested-clean-test/target/classes</outputDirectory>
<testOutputDirectory>${basedir}/target/test-classes/unit/nested-clean-test/target/test-classes</testOutputDirectory>
+ <verbose>true</verbose>
+ <failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>