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 f1f4b22 Fix vacuous IT checks and run MSHADE-321
new 3deb6c6 Move transformer, relocation and skip ITs to unit tests
new bc58852 Test the shadeSerializedLambda wiring of
ShadeMojo.getRelocators
new 95cdbcd Keep the project name assertion in the mojo notice test,
which covers the hand-off to the transformer
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.
Summary of changes:
.../META-INF/services/org.apache.maven.shade | 1 -
.../mshade-237-one-0.1.pom | 36 ---
.../META-INF/services/org.apache.maven.shade | 1 -
.../mshade-237-two-0.1.pom | 36 ---
src/it/projects/MSHADE-182/pom.xml | 59 ----
.../resources/META-INF/services/relocateme.Service | 1 -
src/it/projects/MSHADE-182/verify.groovy | 23 --
src/it/projects/MSHADE-183/pom.xml | 110 --------
src/it/projects/MSHADE-183/verify.groovy | 49 ----
.../invoker.properties | 18 --
.../one/pom.xml | 30 --
.../maven/plugins/shade/its/Message.properties | 18 --
.../maven/plugins/shade/its/Message_nl.properties | 18 --
.../pom.xml | 48 ----
.../two/pom.xml | 63 -----
.../maven/plugins/shade/its/Message.properties | 18 --
.../maven/plugins/shade/its/Message_nl.properties | 18 --
.../verify.groovy | 31 --
.../projects/MSHADE-240_reloc-mavenfiles/pom.xml | 67 -----
.../MSHADE-240_reloc-mavenfiles/verify.groovy | 36 ---
.../projects/MSHADE-258_module_relocation/pom.xml | 65 -----
.../MSHADE-258_module_relocation/verify.groovy | 31 --
.../MSHADE-260-reloc-serialized-lambda/README.txt | 56 ----
.../invoker.properties | 22 --
.../MSHADE-260-reloc-serialized-lambda/pom.xml | 64 -----
.../verify.groovy | 129 ---------
src/it/projects/MSHADE-354/pom.xml | 56 ----
.../org/apache/maven/its/shade/mshade354/App.java | 25 --
src/it/projects/MSHADE-354/verify.groovy | 48 ----
src/it/projects/MSHADE-368/pom.xml | 67 -----
src/it/projects/MSHADE-368/verify.groovy | 39 ---
.../MSHADE-382_skip_execution/invoker.properties | 18 --
src/it/projects/MSHADE-382_skip_execution/pom.xml | 55 ----
.../MSHADE-382_skip_execution/verify.groovy | 20 --
.../MSHADE-390-sisu-index/invoker.properties | 18 --
src/it/projects/MSHADE-390-sisu-index/one/pom.xml | 30 --
.../one/src/main/java/org/apache/one/One.java | 5 -
.../resources/META-INF/sisu/javax.inject.Named | 1 -
src/it/projects/MSHADE-390-sisu-index/pom.xml | 48 ----
src/it/projects/MSHADE-390-sisu-index/two/pom.xml | 67 -----
.../two/src/main/java/org/apache/two/Two.java | 5 -
.../resources/META-INF/sisu/javax.inject.Named | 1 -
.../projects/MSHADE-390-sisu-index/verify.groovy | 24 --
.../pom.xml | 81 ------
.../verify.groovy | 173 ------------
.../apache-notice-output-timestamp/pom.xml | 74 -----
.../src/main/resources/META-INF/NOTICE | 1 -
.../apache-notice-output-timestamp/verify.groovy | 28 --
src/it/projects/apache-notice-project-name/pom.xml | 52 ----
.../src/main/resources/META-INF/NOTICE | 1 -
.../apache-notice-project-name/verify.groovy | 28 --
.../projects/artifactset-unmatched-pattern/pom.xml | 77 -----
.../artifactset-unmatched-pattern/verify.groovy | 23 --
.../projects/empty-apache-notice-transform/pom.xml | 79 ------
.../empty-relocation-shaded-pattern/pom.xml | 64 -----
.../invoker.properties | 18 --
.../projects/include-resource-missing-file/pom.xml | 73 -----
.../include-resource-missing-file/verify.groovy | 22 --
src/it/projects/manifest-transformed/pom.xml | 109 --------
src/it/projects/manifest-transformed/verify.groovy | 45 ---
.../reloc-abs-resource-path-exclude/pom.xml | 94 -------
src/it/projects/reloc-abs-resource-path/pom.xml | 91 ------
.../src/main/java/Main.java | 39 ---
src/it/projects/reloc-anno/invoker.properties | 18 --
src/it/projects/reloc-anno/pom.xml | 111 --------
.../projects/reloc-class-from-string-pool/pom.xml | 104 -------
.../src/main/java/Main.java | 72 -----
.../src/main/java/relocated/RelocatedClass.java | 24 --
.../reloc-enum-ref-from-anno/invoker.properties | 18 --
src/it/projects/reloc-enum-ref-from-anno/pom.xml | 111 --------
.../src/main/java/MyAnno.java | 26 --
.../src/main/java/relocated/MyEnum.java | 27 --
src/it/projects/reloc-includes-excludes/pom.xml | 80 ------
.../projects/reloc-includes-excludes/verify.groovy | 56 ----
.../pom.xml | 78 ------
.../verify.groovy | 38 ---
.../projects/services-resource-transformer/pom.xml | 71 -----
.../services-resource-transformer/verify.groovy | 32 ---
.../projects/xml-transformer-ignores-dtd/pom.xml | 61 ----
.../src/main/resources/test.xml | 25 --
.../xml-transformer-ignores-dtd/verify.groovy | 37 ---
.../maven/plugins/shade/DefaultShaderTest.java | 33 +++
.../maven/plugins/shade/ShadedRelocationTest.java | 311 +++++++++++++++++++++
.../maven/plugins/shade/mojo/ShadeMojoTest.java | 158 +++++++++++
.../relocation/SimpleRelocatorParameterTest.java | 44 +++
.../shade/relocation/fixture/abspath/Main.java | 53 ++++
.../relocation/fixture/abspathexclude}/Main.java | 35 ++-
.../shade/relocation/fixture/anno}/Main.java | 39 ++-
.../relocation/fixture/anno/relocated/MyAnno.java | 41 +++
.../shade/relocation/fixture/enumanno}/Main.java | 20 +-
.../shade/relocation/fixture/enumanno}/MyAnno.java | 10 +-
.../fixture/enumanno/relocated/MyEnum.java | 43 +++
.../relocation/fixture}/lambda/DataHolder.java | 2 +-
.../shade/relocation/fixture}/lambda/Main.java | 11 +-
.../relocation/fixture}/lambda/MapFunction.java | 5 +-
.../relocation/fixture}/lambda/Processor.java | 4 +-
.../shade/relocation/fixture/stringpool/Main.java | 61 ++++
.../stringpool/relocated/RelocatedClass.java | 40 +++
.../ApacheNoticeResourceTransformerTest.java | 40 +++
.../resource/GroovyResourceTransformerTest.java | 20 ++
.../resource/ManifestResourceTransformerTest.java | 69 +++++
.../ResourceBundleAppendingTransformerTest.java | 74 +++++
.../resource/ServiceResourceTransformerTest.java | 31 ++
.../resource/SisuIndexResourceTransformerTest.java | 92 ++++++
.../resource/XmlAppendingTransformerTest.java | 36 +++
.../abspath/org/apache/maven/from}/test.properties | 0
.../org/apache/maven/from/a}/test.properties | 0
.../org/apache/maven/from/b/test.properties | 0
108 files changed, 1217 insertions(+), 3791 deletions(-)
delete mode 100644
src/it/mrm/repository/services-resource-transformer-with-reloc-includes-excludes/mshade-237-one-0.1.jar/META-INF/services/org.apache.maven.shade
delete mode 100644
src/it/mrm/repository/services-resource-transformer-with-reloc-includes-excludes/mshade-237-one-0.1.pom
delete mode 100644
src/it/mrm/repository/services-resource-transformer-with-reloc-includes-excludes/mshade-237-two-0.1.jar/META-INF/services/org.apache.maven.shade
delete mode 100644
src/it/mrm/repository/services-resource-transformer-with-reloc-includes-excludes/mshade-237-two-0.1.pom
delete mode 100644 src/it/projects/MSHADE-182/pom.xml
delete mode 100644
src/it/projects/MSHADE-182/src/main/resources/META-INF/services/relocateme.Service
delete mode 100644 src/it/projects/MSHADE-182/verify.groovy
delete mode 100644 src/it/projects/MSHADE-183/pom.xml
delete mode 100644 src/it/projects/MSHADE-183/verify.groovy
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/invoker.properties
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/one/pom.xml
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/plugins/shade/its/Message.properties
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/plugins/shade/its/Message_nl.properties
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/pom.xml
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/two/pom.xml
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/plugins/shade/its/Message.properties
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/plugins/shade/its/Message_nl.properties
delete mode 100644
src/it/projects/MSHADE-232_ResourceBundleAppendingTransformer/verify.groovy
delete mode 100644 src/it/projects/MSHADE-240_reloc-mavenfiles/pom.xml
delete mode 100644 src/it/projects/MSHADE-240_reloc-mavenfiles/verify.groovy
delete mode 100644 src/it/projects/MSHADE-258_module_relocation/pom.xml
delete mode 100644 src/it/projects/MSHADE-258_module_relocation/verify.groovy
delete mode 100644
src/it/projects/MSHADE-260-reloc-serialized-lambda/README.txt
delete mode 100644
src/it/projects/MSHADE-260-reloc-serialized-lambda/invoker.properties
delete mode 100644 src/it/projects/MSHADE-260-reloc-serialized-lambda/pom.xml
delete mode 100644
src/it/projects/MSHADE-260-reloc-serialized-lambda/verify.groovy
delete mode 100644 src/it/projects/MSHADE-354/pom.xml
delete mode 100644
src/it/projects/MSHADE-354/src/main/java/org/apache/maven/its/shade/mshade354/App.java
delete mode 100644 src/it/projects/MSHADE-354/verify.groovy
delete mode 100644 src/it/projects/MSHADE-368/pom.xml
delete mode 100644 src/it/projects/MSHADE-368/verify.groovy
delete mode 100644 src/it/projects/MSHADE-382_skip_execution/invoker.properties
delete mode 100644 src/it/projects/MSHADE-382_skip_execution/pom.xml
delete mode 100644 src/it/projects/MSHADE-382_skip_execution/verify.groovy
delete mode 100644 src/it/projects/MSHADE-390-sisu-index/invoker.properties
delete mode 100644 src/it/projects/MSHADE-390-sisu-index/one/pom.xml
delete mode 100644
src/it/projects/MSHADE-390-sisu-index/one/src/main/java/org/apache/one/One.java
delete mode 100644
src/it/projects/MSHADE-390-sisu-index/one/src/main/resources/META-INF/sisu/javax.inject.Named
delete mode 100644 src/it/projects/MSHADE-390-sisu-index/pom.xml
delete mode 100644 src/it/projects/MSHADE-390-sisu-index/two/pom.xml
delete mode 100644
src/it/projects/MSHADE-390-sisu-index/two/src/main/java/org/apache/two/Two.java
delete mode 100644
src/it/projects/MSHADE-390-sisu-index/two/src/main/resources/META-INF/sisu/javax.inject.Named
delete mode 100644 src/it/projects/MSHADE-390-sisu-index/verify.groovy
delete mode 100644
src/it/projects/MSHADE-391_noRelocationKeepOriginalClasses/pom.xml
delete mode 100644
src/it/projects/MSHADE-391_noRelocationKeepOriginalClasses/verify.groovy
delete mode 100644 src/it/projects/apache-notice-output-timestamp/pom.xml
delete mode 100644
src/it/projects/apache-notice-output-timestamp/src/main/resources/META-INF/NOTICE
delete mode 100644 src/it/projects/apache-notice-output-timestamp/verify.groovy
delete mode 100644 src/it/projects/apache-notice-project-name/pom.xml
delete mode 100644
src/it/projects/apache-notice-project-name/src/main/resources/META-INF/NOTICE
delete mode 100644 src/it/projects/apache-notice-project-name/verify.groovy
delete mode 100644 src/it/projects/artifactset-unmatched-pattern/pom.xml
delete mode 100644 src/it/projects/artifactset-unmatched-pattern/verify.groovy
delete mode 100644 src/it/projects/empty-apache-notice-transform/pom.xml
delete mode 100644 src/it/projects/empty-relocation-shaded-pattern/pom.xml
delete mode 100644
src/it/projects/include-resource-missing-file/invoker.properties
delete mode 100644 src/it/projects/include-resource-missing-file/pom.xml
delete mode 100644 src/it/projects/include-resource-missing-file/verify.groovy
delete mode 100644 src/it/projects/manifest-transformed/pom.xml
delete mode 100644 src/it/projects/manifest-transformed/verify.groovy
delete mode 100644 src/it/projects/reloc-abs-resource-path-exclude/pom.xml
delete mode 100644 src/it/projects/reloc-abs-resource-path/pom.xml
delete mode 100644
src/it/projects/reloc-abs-resource-path/src/main/java/Main.java
delete mode 100644 src/it/projects/reloc-anno/invoker.properties
delete mode 100644 src/it/projects/reloc-anno/pom.xml
delete mode 100644 src/it/projects/reloc-class-from-string-pool/pom.xml
delete mode 100644
src/it/projects/reloc-class-from-string-pool/src/main/java/Main.java
delete mode 100644
src/it/projects/reloc-class-from-string-pool/src/main/java/relocated/RelocatedClass.java
delete mode 100644 src/it/projects/reloc-enum-ref-from-anno/invoker.properties
delete mode 100644 src/it/projects/reloc-enum-ref-from-anno/pom.xml
delete mode 100644
src/it/projects/reloc-enum-ref-from-anno/src/main/java/MyAnno.java
delete mode 100644
src/it/projects/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java
delete mode 100644 src/it/projects/reloc-includes-excludes/pom.xml
delete mode 100644 src/it/projects/reloc-includes-excludes/verify.groovy
delete mode 100644
src/it/projects/services-resource-transformer-with-reloc-includes-excludes/pom.xml
delete mode 100644
src/it/projects/services-resource-transformer-with-reloc-includes-excludes/verify.groovy
delete mode 100644 src/it/projects/services-resource-transformer/pom.xml
delete mode 100644 src/it/projects/services-resource-transformer/verify.groovy
delete mode 100644 src/it/projects/xml-transformer-ignores-dtd/pom.xml
delete mode 100644
src/it/projects/xml-transformer-ignores-dtd/src/main/resources/test.xml
delete mode 100644 src/it/projects/xml-transformer-ignores-dtd/verify.groovy
create mode 100644
src/test/java/org/apache/maven/plugins/shade/ShadedRelocationTest.java
create mode 100644
src/test/java/org/apache/maven/plugins/shade/relocation/fixture/abspath/Main.java
rename src/{it/projects/reloc-abs-resource-path-exclude/src/main/java =>
test/java/org/apache/maven/plugins/shade/relocation/fixture/abspathexclude}/Main.java
(51%)
rename src/{it/projects/reloc-anno/src/main/java =>
test/java/org/apache/maven/plugins/shade/relocation/fixture/anno}/Main.java
(54%)
create mode 100644
src/test/java/org/apache/maven/plugins/shade/relocation/fixture/anno/relocated/MyAnno.java
rename src/{it/projects/reloc-enum-ref-from-anno/src/main/java =>
test/java/org/apache/maven/plugins/shade/relocation/fixture/enumanno}/Main.java
(59%)
rename src/{it/projects/reloc-anno/src/main/java/relocated =>
test/java/org/apache/maven/plugins/shade/relocation/fixture/enumanno}/MyAnno.java
(75%)
create mode 100644
src/test/java/org/apache/maven/plugins/shade/relocation/fixture/enumanno/relocated/MyEnum.java
rename
src/{it/projects/MSHADE-260-reloc-serialized-lambda/src/main/java/org/apache/maven/its/shade/reloc
=>
test/java/org/apache/maven/plugins/shade/relocation/fixture}/lambda/DataHolder.java
(94%)
rename
src/{it/projects/MSHADE-260-reloc-serialized-lambda/src/main/java/org/apache/maven/its/shade/reloc
=>
test/java/org/apache/maven/plugins/shade/relocation/fixture}/lambda/Main.java
(84%)
rename
src/{it/projects/MSHADE-260-reloc-serialized-lambda/src/main/java/org/apache/maven/its/shade/reloc
=>
test/java/org/apache/maven/plugins/shade/relocation/fixture}/lambda/MapFunction.java
(89%)
rename
src/{it/projects/MSHADE-260-reloc-serialized-lambda/src/main/java/org/apache/maven/its/shade/reloc
=>
test/java/org/apache/maven/plugins/shade/relocation/fixture}/lambda/Processor.java
(88%)
create mode 100644
src/test/java/org/apache/maven/plugins/shade/relocation/fixture/stringpool/Main.java
create mode 100644
src/test/java/org/apache/maven/plugins/shade/relocation/fixture/stringpool/relocated/RelocatedClass.java
create mode 100644
src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java
rename
src/{it/projects/reloc-abs-resource-path-exclude/src/main/resources/org/apache/maven/from/a
=>
test/resources/relocation-fixture/abspath/org/apache/maven/from}/test.properties
(100%)
rename
src/{it/projects/reloc-abs-resource-path/src/main/resources/org/apache/maven/from
=>
test/resources/relocation-fixture/abspathexclude/org/apache/maven/from/a}/test.properties
(100%)
rename src/{it/projects/reloc-abs-resource-path-exclude/src/main/resources =>
test/resources/relocation-fixture/abspathexclude}/org/apache/maven/from/b/test.properties
(100%)