svn commit: r1691062 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java

[bimargulies]

Author: bimargulies
Date: Tue Jul 14 19:06:43 2015
New Revision: 1691062

URL: http://svn.apache.org/r1691062
Log:
MASSEMBLY-777: revert for more thought.

Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java?rev=1691062&r1=1691061&r2=1691062&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
 Tue Jul 14 19:06:43 2015
@@ -164,7 +164,8 @@ public class AddFileSetsTask
             task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() );
 
             final List<String> excludes = fileSet.getExcludes();
-            // MASSEMBLY-777: before 3.0.0, this forced an exclude for 
*.filtered and *.formatted
+            excludes.add( "**/*.filtered" );
+            excludes.add( "**/*.formatted" );
             task.setExcludes( excludes );
 
             task.setIncludes( fileSet.getIncludes() );