Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-811 

Add default excludes after the main excludes are set so that they don't get overwritten.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267436 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-03 08:00:53 +00:00
parent efa3609d70
commit 66869b1f65
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
View File

@ -35,9 +35,7 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
@ -105,8 +103,6 @@ protected void copyResources( List resources, String outputDirectory )
{
initializeFiltering();
Map resourceEntries = new TreeMap();
for ( Iterator i = resources.iterator(); i.hasNext(); )
{
Resource resource = (Resource) i.next();
@ -121,7 +117,6 @@ protected void copyResources( List resources, String outputDirectory )
}
DirectoryScanner scanner = new DirectoryScanner();
scanner.addDefaultExcludes();
scanner.setBasedir( resource.getDirectory() );
if ( resource.getIncludes() != null && !resource.getIncludes().isEmpty() )
@ -137,6 +132,7 @@ protected void copyResources( List resources, String outputDirectory )
scanner.setExcludes( (String[]) resource.getExcludes().toArray( EMPTY_STRING_ARRAY ) );
}
scanner.addDefaultExcludes();
scanner.scan();
List includedFiles = Arrays.asList( scanner.getIncludedFiles() );