Author: dennisl
Date: Wed Nov 7 09:46:46 2007
New Revision: 592826
URL: http://svn.apache.org/viewvc?rev=592826&view=rev
Log:
[MSOURCES-27] Specifying excludes in the configuration removes the default
excludes
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=592826&r1=592825&r2=592826&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Wed Nov 7 09:46:46 2007
@@ -31,6 +31,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -229,7 +230,10 @@
}
else
{
- excludes = (String[]) resourceExcludes.toArray( new
String[resourceExcludes.size()] );
+ List allExcludes = new ArrayList();
+ allExcludes.addAll( FileUtils.getDefaultExcludesAsList() );
+ allExcludes.addAll( resourceExcludes );
+ excludes = (String[]) allExcludes.toArray( new
String[allExcludes.size()] );
}
String targetPath = resource.getTargetPath();
if ( targetPath != null )
