This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-shade-plugin.
commit 9311c1fa72e75d7b2f873586833d630dba5571d4 Merge: d858373 6db2ae3 Author: Emmanuel Bourg <[email protected]> Date: Mon Jan 18 10:39:41 2016 +0100 Merge tag 'upstream/2.4.3' Upstream version 2.4.3 pom.xml | 258 +++ rel-path-test-files/a/b/c/d/pom | 0 rel-path-test-files/a/b/c/d1/pom | 0 rel-path-test-files/a/b/c/pom | 0 rel-path-test-files/a/b/c1/pom | 0 rel-path-test-files/a/b/pom | 0 rel-path-test-files/a/b1/pom | 0 rel-path-test-files/a/pom | 0 src/it/MSHADE-105/bundle/pom.xml | 55 + .../bundle/src/main/java/test/Dummy.java | 32 + src/it/MSHADE-105/pom.xml | 32 + src/it/MSHADE-105/shaded-jar/pom.xml | 61 + src/it/MSHADE-105/verify.bsh | 38 + src/it/MSHADE-114/pom.xml | 61 + src/it/MSHADE-133/pom.xml | 58 + src/it/MSHADE-133/src/main/resources/logback.xml | 20 + src/it/MSHADE-133/src/main/resources/myConfig.yml | 0 src/it/MSHADE-133/verify.groovy | 23 + src/it/MSHADE-155/pom.xml | 58 + .../src/main/resources/META-INF/ejb-jar.xml | 21 + src/it/MSHADE-155/verify.groovy | 26 + src/it/MSHADE-183/pom.xml | 110 + src/it/MSHADE-183/verify.bsh | 49 + src/it/MSHADE-185/pom.xml | 76 + src/it/MSHADE-185/verify.groovy | 31 + src/it/artifact-includes-excludes/pom.xml | 95 + .../org/apache/maven/its/shade/aie/a/0.1/a-0.1.jar | Bin 0 -> 2046 bytes .../org/apache/maven/its/shade/aie/a/0.1/a-0.1.pom | 36 + .../maven/its/shade/aie/a/maven-metadata.xml | 32 + .../org/apache/maven/its/shade/aie/b/0.2/b-0.2.jar | Bin 0 -> 2046 bytes .../org/apache/maven/its/shade/aie/b/0.2/b-0.2.pom | 36 + .../maven/its/shade/aie/b/maven-metadata.xml | 32 + src/it/artifact-includes-excludes/verify.bsh | 52 + src/it/attach-after-lifecycle-fork/pom.xml | 99 + src/it/attach-after-lifecycle-fork/setup.bsh | 29 + src/it/attach-after-lifecycle-fork/verify.bsh | 38 + src/it/attached-artifact-type/consumer/pom.xml | 72 + src/it/attached-artifact-type/invoker.properties | 19 + src/it/attached-artifact-type/pom.xml | 85 + src/it/attached-artifact-type/shade/pom.xml | 62 + .../shade/src/main/resources/META-INF/ejb-jar.xml | 21 + src/it/component-descriptor-relocation/pom.xml | 151 ++ .../maven/its/shade/cdr/comp/0.1/comp-0.1.jar | Bin 0 -> 7262 bytes .../maven/its/shade/cdr/comp/0.1/comp-0.1.pom | 51 + .../maven/its/shade/cdr/comp/maven-metadata.xml | 32 + .../src/main/java/Main.java | 42 + .../java/org/apache/maven/test/TestComponent.java | 35 + .../main/resources/META-INF/plexus/components.xml | 37 + .../dep-reduced-pom-relocated-result/child/pom.xml | 72 + .../invoker.properties | 19 + src/it/dep-reduced-pom-relocated-result/pom.xml | 77 + src/it/dep-reduced-pom-unique/pom.xml | 101 + .../org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar | Bin 0 -> 1945 bytes .../org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom | 36 + .../maven/its/shade/drp/b/0.2/b-0.2-client.jar | Bin 0 -> 1946 bytes .../org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom | 36 + .../org/apache/maven/its/shade/drp/c/1/c-1.pom | 36 + src/it/dep-reduced-pom-unique/verify.groovy | 39 + src/it/dep-reduced-pom-use-base-version/pom.xml | 82 + .../shade/drp/a/0.1-SNAPSHOT/_maven.repositories | 1 + .../a/0.1-SNAPSHOT/a-0.1-20130115.024354-82.jar | Bin 0 -> 3115 bytes .../a/0.1-SNAPSHOT/a-0.1-20130115.024354-82.pom | 36 + .../shade/drp/a/0.1-SNAPSHOT/maven-metadata.xml | 44 + .../dep-reduced-pom-use-base-version/verify.groovy | 29 + .../child/pom.xml | 71 + .../invoker.properties | 19 + src/it/dep-reduced-pom-with-local-parent/pom.xml | 77 + src/it/dep-reduced-pom/pom.xml | 93 + .../org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar | Bin 0 -> 1945 bytes .../org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom | 36 + .../maven/its/shade/drp/b/0.2/b-0.2-client.jar | Bin 0 -> 1946 bytes .../org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom | 36 + .../org/apache/maven/its/shade/drp/c/1/c-1.pom | 36 + src/it/dep-reduced-pom/verify.groovy | 27 + src/it/duplicate-classes-with-reloc/pom.xml | 113 + .../apache/maven/its/shade/dcwr/a/0.1/a-0.1.jar | Bin 0 -> 3414 bytes .../apache/maven/its/shade/dcwr/a/0.1/a-0.1.pom | 29 + .../maven/its/shade/dcwr/a/maven-metadata.xml | 32 + .../apache/maven/its/shade/dcwr/b/0.1/b-0.1.jar | Bin 0 -> 3415 bytes .../apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom | 29 + .../maven/its/shade/dcwr/b/maven-metadata.xml | 32 + src/it/duplicate-classes-without-reloc/pom.xml | 107 + .../apache/maven/its/shade/dcwor/a/0.1/a-0.1.jar | Bin 0 -> 3414 bytes .../apache/maven/its/shade/dcwor/a/0.1/a-0.1.pom | 29 + .../maven/its/shade/dcwor/a/maven-metadata.xml | 32 + .../apache/maven/its/shade/dcwor/b/0.1/b-0.1.jar | Bin 0 -> 3415 bytes .../apache/maven/its/shade/dcwor/b/0.1/b-0.1.pom | 29 + .../maven/its/shade/dcwor/b/maven-metadata.xml | 32 + src/it/empty-apache-notice-transform/pom.xml | 79 + src/it/empty-relocation-pattern/pom.xml | 65 + src/it/empty-relocation-shaded-pattern/pom.xml | 64 + src/it/filter-artifact-contents/pom.xml | 104 + .../org/apache/maven/its/shade/fac/a/0.1/a-0.1.jar | Bin 0 -> 2708 bytes .../org/apache/maven/its/shade/fac/a/0.1/a-0.1.pom | 36 + .../maven/its/shade/fac/a/maven-metadata.xml | 32 + .../maven/its/shade/fac/b/0.1/b-0.1-client.jar | Bin 0 -> 2996 bytes .../org/apache/maven/its/shade/fac/b/0.1/b-0.1.pom | 36 + .../maven/its/shade/fac/b/maven-metadata.xml | 32 + src/it/filter-artifact-contents/verify.bsh | 58 + src/it/finalNameBuild-attached/pom.xml | 61 + src/it/finalNameBuild-attached/setup.bsh | 29 + .../src/main/resources/META-INF/ejb-jar.xml | 21 + src/it/finalNameBuild-attached/verify.bsh | 67 + src/it/finalNameBuild/pom.xml | 60 + src/it/finalNameBuild/setup.bsh | 29 + .../src/main/resources/META-INF/ejb-jar.xml | 21 + src/it/finalNameBuild/verify.bsh | 58 + src/it/finalNameShade-attached/pom.xml | 61 + src/it/finalNameShade-attached/setup.bsh | 29 + .../src/main/resources/META-INF/ejb-jar.xml | 21 + src/it/finalNameShade-attached/verify.bsh | 68 + src/it/finalNameShade/pom.xml | 60 + src/it/finalNameShade/setup.bsh | 29 + .../src/main/resources/META-INF/ejb-jar.xml | 21 + src/it/finalNameShade/verify.bsh | 59 + .../implicit-inclusion-of-project-artifact/pom.xml | 70 + .../src/main/java/Passed.java | 22 + .../verify.bsh | 37 + src/it/manifest-retained/pom.xml | 101 + src/it/manifest-retained/verify.bsh | 36 + src/it/manifest-transformed/pom.xml | 109 + src/it/manifest-transformed/verify.bsh | 45 + src/it/mini-jar-malformed-dependencies/pom.xml | 65 + src/it/mini-jar-package-info/invoker.properties | 18 + .../jar-with-package-info/pom.xml | 35 + .../java/org/apache/maven/it/pi/HaveOneClass.java | 25 + .../apache/maven/it/pi/TestPackageAnnotation.java | 28 + .../java/org/apache/maven/it/pi/package-info.java | 26 + src/it/mini-jar-package-info/pom.xml | 55 + src/it/mini-jar-package-info/test/pom.xml | 68 + .../src/main/java/org/apache/maven/it/pi/Main.java | 24 + src/it/mini-jar-package-info/verify.bsh | 51 + .../mini-jar-respect-includes/invoker.properties | 18 + src/it/mini-jar-respect-includes/pom.xml | 101 + .../src/main/java/Main.java | 23 + src/it/mini-jar-respect-includes/verify.bsh | 56 + src/it/mini-jar/invoker.properties | 18 + src/it/mini-jar/pom.xml | 75 + src/it/mini-jar/src/main/java/Main.java | 23 + src/it/mini-jar/verify.bsh | 53 + src/it/mshade-123/assembly.xml | 36 + src/it/mshade-123/pom.xml | 121 ++ src/it/mshade-123/sample.txt | 1 + src/it/non-runtime-scope-excluded/pom.xml | 103 + .../its/shade/nrse/compile/1.0/compile-1.0.jar | Bin 0 -> 2187 bytes .../its/shade/nrse/compile/1.0/compile-1.0.pom | 41 + .../its/shade/nrse/compile/maven-metadata.xml | 32 + .../its/shade/nrse/provided/1.0/provided-1.0.jar | Bin 0 -> 2198 bytes .../its/shade/nrse/provided/1.0/provided-1.0.pom | 41 + .../its/shade/nrse/provided/maven-metadata.xml | 32 + .../its/shade/nrse/runtime/1.0/runtime-1.0.jar | Bin 0 -> 2183 bytes .../its/shade/nrse/runtime/1.0/runtime-1.0.pom | 41 + .../its/shade/nrse/runtime/maven-metadata.xml | 32 + .../maven/its/shade/nrse/test/1.0/test-1.0.jar | Bin 0 -> 2159 bytes .../maven/its/shade/nrse/test/1.0/test-1.0.pom | 41 + .../maven/its/shade/nrse/test/maven-metadata.xml | 32 + src/it/non-runtime-scope-excluded/system.jar | Bin 0 -> 455 bytes src/it/non-runtime-scope-excluded/verify.bsh | 53 + src/it/plugin-descriptor-relocation/pom.xml | 126 ++ .../maven/its/shade/cdr/comp/0.1/comp-0.1.jar | Bin 0 -> 7262 bytes .../maven/its/shade/cdr/comp/0.1/comp-0.1.pom | 51 + .../maven/its/shade/cdr/comp/maven-metadata.xml | 32 + .../src/main/java/org/apache/maven/test/Entry.java | 25 + .../main/java/org/apache/maven/test/TestMojo.java | 46 + src/it/plugin-descriptor-relocation/verify.groovy | 24 + src/it/pom-packaging/pom.xml | 65 + src/it/pom-packaging/verify.bsh | 49 + .../invoker.properties | 18 + src/it/project-with-reactors-included/one/pom.xml | 41 + .../apache/maven/plugins/shade/its/one/App.java | 33 + .../apache/maven/plugins/shade/its/one/AppOne.java | 33 + .../maven/plugins/shade/its/one/AppTest.java | 58 + src/it/project-with-reactors-included/pom.xml | 71 + src/it/project-with-reactors-included/two/pom.xml | 70 + .../apache/maven/plugins/shade/its/two/App.java | 33 + .../maven/plugins/shade/its/two/AppTest.java | 58 + src/it/project-with-reactors-included/verify.bsh | 43 + src/it/reloc-abs-resource-path/pom.xml | 90 + .../src/main/java/Main.java | 39 + .../org/apache/maven/from/test.properties | 18 + src/it/reloc-anno/invoker.properties | 18 + src/it/reloc-anno/pom.xml | 108 + src/it/reloc-anno/src/main/java/Main.java | 59 + .../reloc-anno/src/main/java/relocated/MyAnno.java | 25 + src/it/reloc-class-from-string-pool/pom.xml | 104 + .../src/main/java/Main.java | 72 + .../src/main/java/relocated/RelocatedClass.java | 24 + src/it/reloc-enum-ref-from-anno/invoker.properties | 18 + src/it/reloc-enum-ref-from-anno/pom.xml | 108 + .../src/main/java/Main.java | 35 + .../src/main/java/MyAnno.java | 26 + .../src/main/java/relocated/MyEnum.java | 27 + src/it/reloc-includes-excludes/pom.xml | 80 + src/it/reloc-includes-excludes/verify.bsh | 56 + src/it/rerun-with-reloc/invoker.properties | 19 + src/it/rerun-with-reloc/pom.xml | 109 + .../src/main/java/org/MyInterface.java | 28 + .../src/main/resources/some-ordinary-resource.txt | 0 src/it/rerun-without-reloc/invoker.properties | 19 + src/it/rerun-without-reloc/pom.xml | 103 + .../src/main/java/org/MyInterface.java | 28 + .../src/main/resources/some-ordinary-resource.txt | 0 src/it/services-resource-transformer/pom.xml | 86 + .../apache/maven/its/shade/srt/one/0.1/one-0.1.jar | Bin 0 -> 2275 bytes .../apache/maven/its/shade/srt/one/0.1/one-0.1.pom | 36 + .../maven/its/shade/srt/one/maven-metadata.xml | 32 + .../apache/maven/its/shade/srt/two/0.1/two-0.1.jar | Bin 0 -> 2278 bytes .../apache/maven/its/shade/srt/two/0.1/two-0.1.pom | 36 + .../maven/its/shade/srt/two/maven-metadata.xml | 32 + src/it/services-resource-transformer/verify.bsh | 32 + src/it/settings.xml | 55 + src/it/shadePomDependency/pom.xml | 46 + src/it/shadePomDependency/pomDependency/pom.xml | 47 + src/it/shadePomDependency/shadingModule/pom.xml | 71 + src/it/shadePomDependency/testModule/pom.xml | 45 + .../testModule/src/main/java/ShadedClassUsage.java | 27 + .../shading-with-java-8-sources/invoker.properties | 19 + src/it/shading-with-java-8-sources/pom.xml | 114 + .../org/apache/maven/plugins/shade/its/App.java | 50 + src/it/shading-with-java-8-sources/verify.groovy | 24 + src/it/users-shader-impl/invoker.properties | 18 + src/it/users-shader-impl/pom.xml | 85 + .../org/apache/maven/plugins/shade/its/App.java | 33 + .../apache/maven/plugins/shade/its/AppTest.java | 58 + src/it/users-shader-impl/verify.groovy | 24 + src/it/xml-transformer-ignores-dtd/pom.xml | 61 + .../src/main/resources/test.xml | 25 + src/it/xml-transformer-ignores-dtd/verify.bsh | 37 + .../apache/maven/plugins/shade/DefaultShader.java | 621 ++++++ .../apache/maven/plugins/shade/ShadeRequest.java | 140 ++ .../org/apache/maven/plugins/shade/Shader.java | 42 + .../apache/maven/plugins/shade/ShadingResult.java | 29 + .../apache/maven/plugins/shade/filter/Filter.java | 45 + .../maven/plugins/shade/filter/MinijarFilter.java | 240 +++ .../maven/plugins/shade/filter/SimpleFilter.java | 152 ++ .../maven/plugins/shade/mojo/ArchiveFilter.java | 49 + .../maven/plugins/shade/mojo/ArtifactId.java | 122 ++ .../maven/plugins/shade/mojo/ArtifactSelector.java | 96 + .../maven/plugins/shade/mojo/ArtifactSet.java | 42 + .../plugins/shade/mojo/PackageRelocation.java | 64 + .../maven/plugins/shade/mojo/RelativizePath.java | 111 + .../apache/maven/plugins/shade/mojo/ShadeMojo.java | 1161 +++++++++++ .../apache/maven/plugins/shade/pom/Counter.java | 79 + .../maven/plugins/shade/pom/MavenJDOMWriter.java | 2196 ++++++++++++++++++++ .../apache/maven/plugins/shade/pom/PomWriter.java | 77 + .../maven/plugins/shade/relocation/Relocator.java | 36 + .../plugins/shade/relocation/SimpleRelocator.java | 211 ++ .../resource/ApacheLicenseResourceTransformer.java | 62 + .../resource/ApacheNoticeResourceTransformer.java | 256 +++ .../shade/resource/AppendingTransformer.java | 73 + .../resource/ComponentsXmlResourceTransformer.java | 213 ++ .../resource/DontIncludeResourceTransformer.java | 78 + .../shade/resource/IncludeResourceTransformer.java | 69 + .../resource/ManifestResourceTransformer.java | 111 + .../resource/PluginXmlResourceTransformer.java | 231 ++ .../shade/resource/ResourceTransformer.java | 48 + .../resource/ServicesResourceTransformer.java | 137 ++ .../shade/resource/XmlAppendingTransformer.java | 140 ++ src/site/apt/examples/attached-artifact.apt.vm | 60 + src/site/apt/examples/class-relocation.apt.vm | 72 + src/site/apt/examples/executable-jar.apt.vm | 97 + src/site/apt/examples/includes-excludes.apt.vm | 198 ++ src/site/apt/examples/resource-transformers.apt.vm | 474 +++++ src/site/apt/examples/use-shader-other-impl.apt.vm | 103 + src/site/apt/index.apt.vm | 73 + src/site/apt/usage.apt.vm | 89 + src/site/fml/faq.fml | 43 + src/site/resources/download.cgi | 22 + src/site/site.xml | 70 + src/site/xdoc/download.xml.vm | 126 ++ src/test/jars/plexus-utils-1.4.1.jar | Bin 0 -> 188648 bytes src/test/jars/test-artifact-1.0-SNAPSHOT.jar | Bin 0 -> 3115 bytes src/test/jars/test-project-1.0-SNAPSHOT.jar | Bin 0 -> 3906 bytes .../maven/plugins/shade/DefaultShaderTest.java | 203 ++ .../org/apache/maven/plugins/shade/MockShader.java | 38 + .../plugins/shade/filter/MinijarFilterTest.java | 100 + .../plugins/shade/filter/SimpleFilterTest.java | 77 + .../maven/plugins/shade/mojo/ArtifactIdTest.java | 169 ++ .../plugins/shade/mojo/ArtifactSelectorTest.java | 71 + .../plugins/shade/mojo/RelativizePathTest.java | 52 + .../maven/plugins/shade/mojo/ShadeMojoTest.java | 220 ++ .../relocation/SimpleRelocatorParameterTest.java | 58 + .../shade/relocation/SimpleRelocatorTest.java | 144 ++ .../ApacheLicenseResourceTransformerTest.java | 60 + ...cheNoticeResourceTransformerParameterTests.java | 106 + .../ApacheNoticeResourceTransformerTest.java | 60 + .../shade/resource/AppendingTransformerTest.java | 61 + .../ComponentsXmlResourceTransformerTest.java | 72 + .../resource/ServiceResourceTransformerTest.java | 153 ++ .../resource/XmlAppendingTransformerTest.java | 61 + src/test/projects/default-config-project/pom.xml | 55 + src/test/projects/no-relocation-project/pom.xml | 66 + src/test/projects/pom.xml | 35 + src/test/projects/shaded-attached-project/pom.xml | 78 + src/test/projects/shaded-project/pom.xml | 76 + src/test/projects/shaded-renamed-project/pom.xml | 73 + src/test/projects/test-artifact/pom.xml | 40 + .../java/org/apache/maven/plugins/shade/Lib.java | 47 + src/test/projects/test-project/pom.xml | 48 + .../java/org/apache/maven/plugins/shade/App.java | 35 + .../main/resources/META-INF/plexus/components.xml | 209 ++ .../org/apache/maven/plugins/shade/AppTest.java | 56 + src/test/resources/components-1.xml | 48 + src/test/resources/components-2.xml | 48 + src/test/resources/components-expected.xml | 56 + 305 files changed, 20735 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-shade-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
