Author: bentmann Date: Fri May 1 16:51:00 2009 New Revision: 770750 URL: http://svn.apache.org/viewvc?rev=770750&view=rev Log: [MASSEMBLY-382] Review IT failure on Windows
o Normalized file separator for platform-independent pattern matching Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java?rev=770750&r1=770749&r2=770750&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java Fri May 1 16:51:00 2009 @@ -153,6 +153,8 @@ String name = fileInfo.getName(); + name = name.replace( File.separatorChar, '/' ); + if ( fileInfo.isFile() && name.matches( filePattern ) ) { readProperties( fileInfo );