This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHADE-306
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
discard 1c013a6 MSHADE-306 log all duplicates to not silently swallow a
duplicate and an implicit selection
add ad61743 Use diamond operator from java 7
add 0562c51 replace "UTF-8" with StandardCharsets.UTF_8 constant use
try-with-resources from java 7 where possible remove redundant casts
add ee481d6 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/maven-shade-plugin
add cfe70aa Merge branch 'master' of
https://gitbox.apache.org/repos/asf/maven-shade-plugin
add 4f8bcef Keep Services
add c22949b Keeping services always
add 2e8b926 Fixed: Failed in serveral cases
add d352a22 testing service description file syntax
add 7cdf37d improved comprehensibility
add b896388 workaround: RAT tries to check compiler plugin's log
add 8278c9f [MSHADE-313] Minimize jar should respect implementations
under /META-INF/services/
add d11c35b [MSHADE-316] Configuration option <excludeDefaults> New
configuration option <excludeDefaults> (default: true) When set to false
providing an <include> will NOT automatically exclude all other files anymore.
add 2f6663c [MSHADE-316] Configuration option <excludeDefaults> New
configuration option <excludeDefaults> (default: true) When set to false
providing an <include> will NOT automatically exclude all other files anymore.
add 68f510e Merge branch 'master' of
https://gitbox.apache.org/repos/asf/maven-shade-plugin
add 73024cc [MSHADE-315] - Broken link on Maven Shade Plugin
add dbd2a5c [MSHADE-320] - Upgrade maven-artifact-transfer to 0.11.0
new d701d0d [MSHADE-306] log all duplicates to not silently swallow a
duplicate and an implicit selection
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1c013a6)
\
N -- N -- N refs/heads/MSHADE-306 (d701d0d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
pom.xml | 9 +-
.../dependency-service/pom.xml} | 57 ++-
.../src/main/java/DependencyReferencedClass.java} | 6 +-
.../src/main/java/DependencyServiceClass.java} | 7 +-
.../src/main/java/DependencyServiceInterface.java} | 4 +-
.../main/java/DependencyUnreferencedClass.java} | 6 +-
.../META-INF/services/DependencyServiceInterface} | 38 +-
.../invoker.properties | 4 +-
.../pom.xml | 22 +-
.../test}/pom.xml | 32 +-
.../test}/src/main/java/Main.java | 10 +-
.../unused-service/pom.xml} | 57 ++-
.../src/main/java/UnusedServiceClass.java} | 3 +-
.../src/main/java/UnusedServiceInterface.java} | 2 +-
.../META-INF/services/UnusedServiceInterface} | 38 +-
.../used-service/pom.xml} | 20 +-
.../src/main/java/SomeReferencedClass.java} | 9 +-
.../src/main/java/SomeServiceClass.java} | 3 +-
.../src/main/java/SomeServiceInterface.java} | 2 +-
.../src/main/java/SomeUnreferencedClass.java} | 2 +-
.../META-INF/services/SomeServiceInterface} | 38 +-
.../verify.bsh | 18 +-
.../b-0.1.pom => MSHADE-316/dependency/pom.xml} | 57 ++-
.../dependency/src/main/java/SomeUnusedClass.java} | 6 +-
.../dependency/src/main/java/SomeUsedClass.java} | 9 +-
.../src/main/java/x/y/z/AnotherExemptedClass.java} | 6 +-
.../src/main/java/x/y/z/SomeExemptedClass.java} | 6 +-
.../invoker.properties | 1 +
.../jar-with-package-info => MSHADE-316}/pom.xml | 20 +-
src/it/{mini-jar => MSHADE-316/test}/pom.xml | 38 +-
.../test}/src/main/java/Main.java | 12 +-
.../verify.bsh | 10 +-
.../apache/maven/plugins/shade/DefaultShader.java | 54 +--
.../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 | 40 +-
.../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, 982 insertions(+), 875 deletions(-)
copy
src/it/{duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom
=> MSHADE-313_minimized-services/dependency-service/pom.xml} (83%)
copy src/it/{implicit-inclusion-of-project-artifact/src/main/java/Passed.java
=>
MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyReferencedClass.java}
(94%)
copy src/it/{reloc-enum-ref-from-anno/src/main/java/MyAnno.java =>
MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceClass.java}
(85%)
copy
src/it/{reloc-class-from-string-pool/src/main/java/relocated/RelocatedClass.java
=>
MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceInterface.java}
(94%)
copy src/it/{implicit-inclusion-of-project-artifact/src/main/java/Passed.java
=>
MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyUnreferencedClass.java}
(94%)
copy src/it/{MSHADE-232_ResourceBundleAppendingTransformer/invoker.properties
=>
MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface}
(88%)
copy src/it/{mini-jar-malformed-dependencies =>
MSHADE-313_minimized-services}/invoker.properties (99%)
copy src/it/{mini-jar-package-info/jar-with-package-info =>
MSHADE-313_minimized-services}/pom.xml (68%)
copy src/it/{implicit-inclusion-of-project-artifact =>
MSHADE-313_minimized-services/test}/pom.xml (73%)
copy src/it/{mini-jar-respect-includes =>
MSHADE-313_minimized-services/test}/src/main/java/Main.java (84%)
copy
src/it/{duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom
=> MSHADE-313_minimized-services/unused-service/pom.xml} (83%)
copy src/it/{mini-jar-respect-includes/src/main/java/Main.java =>
MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceClass.java}
(92%)
copy src/it/{implicit-inclusion-of-project-artifact/src/main/java/Passed.java
=>
MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceInterface.java}
(95%)
copy src/it/{MSHADE-232_ResourceBundleAppendingTransformer/invoker.properties
=>
MSHADE-313_minimized-services/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface}
(88%)
copy
src/it/{services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/0.1/mshade-237-one-0.1.pom
=> MSHADE-313_minimized-services/used-service/pom.xml} (72%)
copy
src/it/{reloc-class-from-string-pool/src/main/java/relocated/RelocatedClass.java
=>
MSHADE-313_minimized-services/used-service/src/main/java/SomeReferencedClass.java}
(85%)
copy src/it/{implicit-inclusion-of-project-artifact/src/main/java/Passed.java
=>
MSHADE-313_minimized-services/used-service/src/main/java/SomeServiceClass.java}
(86%)
copy src/it/{implicit-inclusion-of-project-artifact/src/main/java/Passed.java
=>
MSHADE-313_minimized-services/used-service/src/main/java/SomeServiceInterface.java}
(95%)
copy src/it/{implicit-inclusion-of-project-artifact/src/main/java/Passed.java
=>
MSHADE-313_minimized-services/used-service/src/main/java/SomeUnreferencedClass.java}
(95%)
copy src/it/{MSHADE-232_ResourceBundleAppendingTransformer/invoker.properties
=>
MSHADE-313_minimized-services/used-service/src/main/resources/META-INF/services/SomeServiceInterface}
(88%)
copy src/it/{mini-jar-package-info =>
MSHADE-313_minimized-services}/verify.bsh (73%)
copy
src/it/{duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom
=> MSHADE-316/dependency/pom.xml} (83%)
copy src/it/{implicit-inclusion-of-project-artifact/src/main/java/Passed.java
=> MSHADE-316/dependency/src/main/java/SomeUnusedClass.java} (95%)
copy src/it/{reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java =>
MSHADE-316/dependency/src/main/java/SomeUsedClass.java} (93%)
copy
src/it/{reloc-class-from-string-pool/src/main/java/relocated/RelocatedClass.java
=> MSHADE-316/dependency/src/main/java/x/y/z/AnotherExemptedClass.java} (94%)
copy
src/it/{reloc-class-from-string-pool/src/main/java/relocated/RelocatedClass.java
=> MSHADE-316/dependency/src/main/java/x/y/z/SomeExemptedClass.java} (94%)
copy src/it/{mini-jar-malformed-dependencies => MSHADE-316}/invoker.properties
(95%)
copy src/it/{mini-jar-package-info/jar-with-package-info =>
MSHADE-316}/pom.xml (73%)
copy src/it/{mini-jar => MSHADE-316/test}/pom.xml (72%)
copy src/it/{mini-jar-respect-includes =>
MSHADE-316/test}/src/main/java/Main.java (76%)
copy src/it/{mini-jar-package-info => MSHADE-316}/verify.bsh (88%)
