This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
from 5282d8db Declare the Maven artifacts the code uses
new 86014e86 [MSHADE-265] Add module-info merging support
new d2c3d71a [MSHADE-265] Limit forced manifest state to output writing
new ccc91b6e [MSHADE-265] Parse module info options case-insensitively
new 98f3a0a9 [MSHADE-265] Allow overriding the shaded module name
The 4 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 | 11 +
.../app}/pom.xml | 28 +-
.../api => MSHADE-215/base}/pom.xml | 20 +-
.../apache/maven/its/shade/mshade215/Base.java} | 6 +-
.../{MSHADE-316 => MSHADE-215}/invoker.properties | 4 +-
src/it/projects/{MSHADE-105 => MSHADE-215}/pom.xml | 32 +-
.../verify.groovy | 13 +-
src/it/projects/module-info-merge/app/pom.xml | 107 ++
.../app/src/main/java/app/api/Application.java} | 16 +-
.../app/src/main/java/module-info.java} | 6 +-
.../automatic}/pom.xml | 42 +-
.../java/automatic/library/AutomaticLibrary.java} | 18 +-
.../java/automatic/library/AutomaticProvider.java} | 13 +-
.../services/external.api.AutomaticService | 1 +
.../api => module-info-merge/embedded}/pom.xml | 25 +-
.../src/main/java/embedded/api/Library.java} | 8 +-
.../src/main/java/embedded/internal/Provider.java} | 11 +-
.../embedded/src/main/java/module-info.java} | 7 +-
.../api => module-info-merge/external}/pom.xml | 18 +-
.../main/java/external/api/AutomaticService.java} | 8 +-
.../src/main/java/external/api/Service.java} | 8 +-
.../external/src/main/java/module-info.java} | 5 +-
.../invoker.properties | 1 +
src/it/projects/module-info-merge/pom.xml | 72 +
src/it/projects/module-info-merge/verify.groovy | 107 ++
.../plugins/shade/AutomaticModuleAnalyzer.java | 246 +++
.../apache/maven/plugins/shade/DefaultShader.java | 207 +-
.../plugins/shade/ModuleInfoConfiguration.java | 194 ++
.../apache/maven/plugins/shade/ModuleInfoMode.java | 51 +
.../maven/plugins/shade/ModuleInfoProcessor.java | 1993 ++++++++++++++++++++
.../plugins/shade/ModuleInfoPublicBoundary.java | 51 +
.../maven/plugins/shade/PlatformModuleIndex.java | 200 ++
.../apache/maven/plugins/shade/ShadeRequest.java | 78 +
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 145 +-
.../resource/ManifestResourceTransformer.java | 103 +-
.../resource/ServicesResourceTransformer.java | 15 +
.../markdown/examples/module-info-merging.md.vm | 203 ++
src/site/markdown/index.md | 1 +
src/site/site.xml | 1 +
.../maven/plugins/shade/DefaultShaderTest.java | 1280 ++++++++++++-
.../plugins/shade/ModuleInfoConfigurationTest.java | 630 +++++++
.../maven/plugins/shade/ModuleInfoModeTest.java | 47 +
.../plugins/shade/PlatformModuleIndexTest.java | 124 ++
.../maven/plugins/shade/mojo/ShadeMojoTest.java | 70 +
.../resource/ManifestResourceTransformerTest.java | 25 +
45 files changed, 6065 insertions(+), 186 deletions(-)
copy src/it/projects/{apache-notice-project-name => MSHADE-215/app}/pom.xml
(69%)
copy src/it/projects/{MSHADE-374_testJarArtifactSet/api =>
MSHADE-215/base}/pom.xml (77%)
copy src/it/projects/{MSHADE-316/dependency/src/main/java/SomeUsedClass.java
=>
MSHADE-215/base/src/main/java/org/apache/maven/its/shade/mshade215/Base.java}
(92%)
copy src/it/projects/{MSHADE-316 => MSHADE-215}/invoker.properties (84%)
copy src/it/projects/{MSHADE-105 => MSHADE-215}/pom.xml (61%)
copy src/it/projects/{include-resource-existing-entry =>
MSHADE-215}/verify.groovy (74%)
create mode 100644 src/it/projects/module-info-merge/app/pom.xml
copy
src/it/projects/{duplicate-classes-without-reloc/libs/src/main/java/org/apache/maven/its/shade/impl/MyImpl.java
=> module-info-merge/app/src/main/java/app/api/Application.java} (78%)
copy src/it/projects/{MSHADE-284_shadeTestJar/impl/src/main/java/Impl.java =>
module-info-merge/app/src/main/java/module-info.java} (88%)
copy src/it/projects/{apache-notice-project-name =>
module-info-merge/automatic}/pom.xml (60%)
copy
src/it/projects/{MSHADE-400_self-minimized-services/src/main/java/org/acme/Application.java
=>
module-info-merge/automatic/src/main/java/automatic/library/AutomaticLibrary.java}
(67%)
copy
src/it/projects/{duplicate-classes-with-reloc/libs/src/main/java/org/apache/maven/its/shade/impl/MyImpl.java
=>
module-info-merge/automatic/src/main/java/automatic/library/AutomaticProvider.java}
(81%)
create mode 100644
src/it/projects/module-info-merge/automatic/src/main/resources/META-INF/services/external.api.AutomaticService
copy src/it/projects/{MSHADE-285_createTestSourcesJar/api =>
module-info-merge/embedded}/pom.xml (69%)
copy
src/it/projects/{MSHADE-285_createTestSourcesJar/api/src/main/java/Api.java =>
module-info-merge/embedded/src/main/java/embedded/api/Library.java} (91%)
copy
src/it/projects/{MSHADE-400_self-minimized-services/src/main/java/org/acme/UsedServiceUnusedImpl.java
=> module-info-merge/embedded/src/main/java/embedded/internal/Provider.java}
(83%)
copy src/it/projects/{MSHADE-284_shadeTestJar/impl/src/main/java/Impl.java =>
module-info-merge/embedded/src/main/java/module-info.java} (81%)
copy src/it/projects/{MSHADE-374_testJarArtifactSet/api =>
module-info-merge/external}/pom.xml (76%)
copy
src/it/projects/{MSHADE-285_createTestSourcesJar/api/src/main/java/Api.java =>
module-info-merge/external/src/main/java/external/api/AutomaticService.java}
(91%)
copy
src/it/projects/{MSHADE-285_createTestSourcesJar/api/src/main/java/Api.java =>
module-info-merge/external/src/main/java/external/api/Service.java} (92%)
copy
src/it/projects/{MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyReferencedClass.java
=> module-info-merge/external/src/main/java/module-info.java} (94%)
copy src/it/projects/{MSHADE-36-inject-dep-reduced-pom-in-final =>
module-info-merge}/invoker.properties (96%)
create mode 100644 src/it/projects/module-info-merge/pom.xml
create mode 100644 src/it/projects/module-info-merge/verify.groovy
create mode 100644
src/main/java/org/apache/maven/plugins/shade/AutomaticModuleAnalyzer.java
create mode 100644
src/main/java/org/apache/maven/plugins/shade/ModuleInfoConfiguration.java
create mode 100644
src/main/java/org/apache/maven/plugins/shade/ModuleInfoMode.java
create mode 100644
src/main/java/org/apache/maven/plugins/shade/ModuleInfoProcessor.java
create mode 100644
src/main/java/org/apache/maven/plugins/shade/ModuleInfoPublicBoundary.java
create mode 100644
src/main/java/org/apache/maven/plugins/shade/PlatformModuleIndex.java
create mode 100644 src/site/markdown/examples/module-info-merging.md.vm
create mode 100644
src/test/java/org/apache/maven/plugins/shade/ModuleInfoConfigurationTest.java
create mode 100644
src/test/java/org/apache/maven/plugins/shade/ModuleInfoModeTest.java
create mode 100644
src/test/java/org/apache/maven/plugins/shade/PlatformModuleIndexTest.java