You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/10/23 18:13:39 UTC
svn commit: r1026633 - in
/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean:
CleanMojo.java Fileset.java
Author: bentmann
Date: Sat Oct 23 16:13:38 2010
New Revision: 1026633
URL: http://svn.apache.org/viewvc?rev=1026633&view=rev
Log:
[MCLEAN-46] Enable useDefaultExcludes per Fileset
Submitted by: Maik Richey
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java
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=1026633&r1=1026632&r2=1026633&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 Sat Oct 23 16:13:38 2010
@@ -188,7 +188,8 @@ public class CleanMojo
{
throw new MojoExecutionException( "Missing base directory for " + fileset );
}
- GlobSelector selector = new GlobSelector( fileset.getIncludes(), fileset.getExcludes() );
+ GlobSelector selector =
+ new GlobSelector( fileset.getIncludes(), fileset.getExcludes(), fileset.isUseDefaultExcludes() );
cleaner.delete( fileset.getDirectory(), selector, fileset.isFollowSymlinks(), failOnError,
retryOnError );
}
Modified: maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java?rev=1026633&r1=1026632&r2=1026633&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java Sat Oct 23 16:13:38 2010
@@ -43,6 +43,8 @@ public class Fileset
private boolean followSymlinks;
+ private boolean useDefaultExcludes;
+
public File getDirectory()
{
return directory;
@@ -63,6 +65,11 @@ public class Fileset
return followSymlinks;
}
+ public boolean isUseDefaultExcludes()
+ {
+ return useDefaultExcludes;
+ }
+
/**
* Retrieves the included and excluded files from this file-set's directory.
* Specifically, <code>"file-set: <I>[directory]</I> (included: