svn commit: r1809790 - in /maven/plugins/trunk/maven-war-plugin/src: it/MWAR-404/ main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java

[michaelo]

Author: michaelo
Date: Tue Sep 26 21:45:18 2017
New Revision: 1809790

URL: http://svn.apache.org/viewvc?rev=1809790&view=rev
Log:
[MWAR-407] Binary files are modified during web.xml filtering; revert MWAR-404

This is a regression caused by MWAR-404 and therefore needs to be reverted for 
now.

Removed:
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-404/
Modified:
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java?rev=1809790&r1=1809789&r2=1809790&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
 Tue Sep 26 21:45:18 2017
@@ -170,14 +170,13 @@ public class WarProjectPackagingTask
         else if ( 
!context.getWebappSourceDirectory().getAbsolutePath().equals( 
context.getWebappDirectory().getPath() ) )
         {
             context.getLog().info( "Copying webapp resources [" + 
context.getWebappSourceDirectory() + "]" );
-            context.getLog().debug( "isFilteringDeploymentDescriptors: [" + 
context.isFilteringDeploymentDescriptors() + "]" );
             final PathSet sources =
                 getFilesToIncludes( context.getWebappSourceDirectory(), 
context.getWebappSourceIncludes(),
                                     context.getWebappSourceExcludes(), 
context.isWebappSourceIncludeEmptyDirectories() );
 
             try
             {
-                 copyFiles( id, context, context.getWebappSourceDirectory(), 
sources, context.isFilteringDeploymentDescriptors() );
+                copyFiles( id, context, context.getWebappSourceDirectory(), 
sources, false );
             }
             catch ( IOException e )
             {