svn commit: r1589280 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java

[khmarbaise]

Author: khmarbaise
Date: Tue Apr 22 20:19:56 2014
New Revision: 1589280

URL: http://svn.apache.org/r1589280
Log:
[MASSEMBLY-696]
 - Patch applied of Kenny Westerhof

Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=1589280&r1=1589279&r2=1589280&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
 Tue Apr 22 20:19:56 2014
@@ -506,7 +506,7 @@ public final class AssemblyFormatUtils
             if (value.contains("." + sep))
             {
                 List<String> parts = new ArrayList<String>();
-                parts.addAll( Arrays.asList( value.split( sep ) ) );
+                parts.addAll( Arrays.asList( value.split( sep.replace( "\\", 
"\\\\" ) ) ) );
                 
                 for ( ListIterator<String> it = parts.listIterator(); 
it.hasNext(); )
                 {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java?rev=1589280&r1=1589279&r2=1589280&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
 Tue Apr 22 20:19:56 2014
@@ -51,6 +51,7 @@ public class AssemblyFormatUtilsTest
         throws AssemblyFormattingException
     {
         assertEquals( "some/path/", AssemblyFormatUtils.fixRelativeRefs( 
"some/./path/" ) );
+        assertEquals( "some\\path\\", AssemblyFormatUtils.fixRelativeRefs( 
"some\\.\\path\\" ) );
     }
 
     public void testFixRelativePathRefs_ShouldRemoveEmbeddedParentDirRef()