commit 774e009fdf2a70ce5759f41679294a49cdd1a7e6
author Benson Margulies <bimargulies@apache.org> Tue Jul 14 19:06:43 2015 +0000
committer Benson Margulies <bimargulies@apache.org> Tue Jul 14 19:06:43 2015 +0000
tree c7e8e833688f9909be1649a343c2b70063eb15cb
parent 019053c3b0fb2899d20e3f309acd4cf3f39fb2bf

MASSEMBLY-777: revert for more thought.


git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1691062 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java

diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
index 7ed5bcf..4a60b68 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
@@ -164,7 +164,8 @@
             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() );