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:17 UTC
[maven-shade-plugin] branch log-all-duplicates created (now beb45f7)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch log-all-duplicates
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
at beb45f7 more windows fixes
This branch includes the following new commits:
new 1afd099 correct handling of OS portable asserts for overlapping log test
new 029a9c2 Merge branch 'master' into log-all-duplicates
new beb45f7 more windows fixes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-shade-plugin] 02/03: Merge branch 'master' into
log-all-duplicates
Posted by sl...@apache.org.
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 029a9c253730166b2ffc64039a5938313bf3319b
Merge: 1afd099 dbd2a5c
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Thu May 16 11:04:53 2019 +0200
Merge branch 'master' into log-all-duplicates
pom.xml | 9 +-
.../dependency-service/pom.xml | 28 ++
.../src/main/java/DependencyReferencedClass.java} | 29 +-
.../src/main/java/DependencyServiceClass.java} | 30 +-
.../src/main/java/DependencyServiceInterface.java} | 29 +-
.../main/java/DependencyUnreferencedClass.java} | 29 +-
.../META-INF/services/DependencyServiceInterface | 20 +
.../invoker.properties | 18 +
src/it/MSHADE-313_minimized-services/pom.xml | 41 ++
src/it/MSHADE-313_minimized-services/test/pom.xml | 70 ++++
.../test/src/main/java/Main.java} | 30 +-
.../unused-service/pom.xml | 28 ++
.../src/main/java/UnusedServiceClass.java} | 33 +-
.../src/main/java/UnusedServiceInterface.java} | 33 +-
.../META-INF/services/UnusedServiceInterface | 20 +
.../used-service/pom.xml | 36 ++
.../src/main/java/SomeReferencedClass.java} | 28 +-
.../src/main/java/SomeServiceClass.java} | 34 +-
.../src/main/java/SomeServiceInterface.java} | 33 +-
.../src/main/java/SomeUnreferencedClass.java} | 33 +-
.../META-INF/services/SomeServiceInterface | 20 +
src/it/MSHADE-313_minimized-services/verify.bsh | 61 +++
src/it/MSHADE-316/dependency/pom.xml | 28 ++
.../dependency/src/main/java/SomeUnusedClass.java} | 29 +-
.../dependency/src/main/java/SomeUsedClass.java} | 29 +-
.../src/main/java/x/y/z/AnotherExemptedClass.java} | 29 +-
.../src/main/java/x/y/z/SomeExemptedClass.java} | 29 +-
src/it/MSHADE-316/invoker.properties | 19 +
src/it/MSHADE-316/pom.xml | 39 ++
src/it/MSHADE-316/test/pom.xml | 75 ++++
.../MSHADE-316/test/src/main/java/Main.java} | 30 +-
.../MSHADE-316/verify.bsh} | 44 +-
.../apache/maven/plugins/shade/DefaultShader.java | 55 +--
.../maven/plugins/shade/filter/MinijarFilter.java | 118 +++++-
.../maven/plugins/shade/filter/SimpleFilter.java | 37 +-
.../maven/plugins/shade/mojo/ArchiveFilter.java | 7 +
.../maven/plugins/shade/mojo/ArtifactSelector.java | 2 +-
.../maven/plugins/shade/mojo/RelativizePath.java | 2 +-
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 48 +--
.../maven/plugins/shade/pom/MavenJDOMWriter.java | 133 +++---
.../plugins/shade/relocation/SimpleRelocator.java | 2 +-
.../resource/ApacheNoticeResourceTransformer.java | 6 +-
.../shade/resource/AppendingTransformer.java | 3 +-
.../resource/ComponentsXmlResourceTransformer.java | 17 +-
.../shade/resource/GroovyResourceTransformer.java | 4 +-
.../shade/resource/IncludeResourceTransformer.java | 13 +-
.../resource/PluginXmlResourceTransformer.java | 459 ++++++++++-----------
.../ResourceBundleAppendingTransformer.java | 193 +++++----
.../shade/resource/ResourceTransformer.java | 2 +-
.../resource/ServicesResourceTransformer.java | 5 +-
src/site/apt/examples/includes-excludes.apt.vm | 18 +-
src/site/apt/index.apt.vm | 2 +-
.../maven/plugins/shade/DefaultShaderTest.java | 24 +-
.../plugins/shade/filter/MinijarFilterTest.java | 4 +-
.../plugins/shade/filter/SimpleFilterTest.java | 19 +
.../maven/plugins/shade/mojo/ShadeMojoTest.java | 22 +-
.../shade/relocation/SimpleRelocatorTest.java | 88 ++--
.../resource/ServiceResourceTransformerTest.java | 7 +-
58 files changed, 1256 insertions(+), 1077 deletions(-)
diff --cc src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index 3619a0d,c4d677a..b08689b
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@@ -27,9 -27,9 +27,10 @@@ import java.io.InputStream
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
+ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
[maven-shade-plugin] 01/03: correct handling of OS portable asserts
for overlapping log test
Posted by sl...@apache.org.
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 1afd09920f15715201518948aed4ad8b3eb55357
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Thu Mar 21 15:04:20 2019 +0100
correct handling of OS portable asserts for overlapping log test
---
.../java/org/apache/maven/plugins/shade/DefaultShaderTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
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 5da7289..feba450 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);
+ debugMessages.add(s.replace(File.separatorChar, '/'));
}
@Override
@@ -77,7 +77,7 @@ public class DefaultShaderTest
@Override
public void warn( final String s, final Throwable throwable )
{
- warnMessages.add(s);
+ warnMessages.add(s.replace(File.separatorChar, '/'));
}
@Override
@@ -120,8 +120,7 @@ public class DefaultShaderTest
final String failureDebugMessage = debugMessages.toString();
assertTrue(failureDebugMessage, debugMessages.contains(
- "We have a duplicate META-INF/MANIFEST.MF in src/test/jars/plexus-utils-1.4.1.jar"
- .replace('/', File.separatorChar)));
+ "We have a duplicate META-INF/MANIFEST.MF in src/test/jars/plexus-utils-1.4.1.jar"));
}
public void testShaderWithDefaultShadedPattern()
[maven-shade-plugin] 03/03: more windows fixes
Posted by sl...@apache.org.
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(