You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/05/16 13:06:20 UTC
[maven-shade-plugin] 03/03: more windows fixes
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch log-all-duplicates
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit beb45f7fa9f8e8366ba0223832f982636d44cff9
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Thu May 16 11:11:54 2019 +0200
more windows fixes
---
.../java/org/apache/maven/plugins/shade/DefaultShader.java | 1 +
.../org/apache/maven/plugins/shade/DefaultShaderTest.java | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index b08689b..d2d06df 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -34,6 +34,7 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.jar.JarEntry;
diff --git a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
index 978a7dd..e32be43 100644
--- a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
@@ -65,7 +65,7 @@ public class DefaultShaderTest
@Override
public void debug( final String s, final Throwable throwable )
{
- debugMessages.add(s.replace(File.separatorChar, '/'));
+ debugMessages.add(sanitize(s));
}
@Override
@@ -77,7 +77,7 @@ public class DefaultShaderTest
@Override
public void warn( final String s, final Throwable throwable )
{
- warnMessages.add(s.replace(File.separatorChar, '/'));
+ warnMessages.add(sanitize(s));
}
@Override
@@ -97,6 +97,11 @@ public class DefaultShaderTest
{
return this;
}
+
+ private String sanitize(final String s) // for tests it makes things simpler and does not break what we test
+ {
+ return s.replace('\\', '/').trim();
+ }
});
// we will shade two jars and expect to see META-INF/MANIFEST.MF overlaps, this will always be true
@@ -115,8 +120,8 @@ public class DefaultShaderTest
final String failureWarnMessage = warnMessages.toString();
assertTrue(failureWarnMessage, warnMessages.contains(
- "plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define 1 overlapping resources: "));
- assertTrue(failureWarnMessage, warnMessages.contains(" - META-INF/MANIFEST.MF"));
+ "plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define 1 overlapping resources:"));
+ assertTrue(failureWarnMessage, warnMessages.contains("- META-INF/MANIFEST.MF"));
final String failureDebugMessage = debugMessages.toString();
assertTrue(failureDebugMessage, debugMessages.contains(