[maven-assembly-plugin] 03/14: Updated version 2.5 from 'upstream/2.5'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jul 24 20:41:47 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-assembly-plugin.

commit 3707aff7ed66edee7f6ebc34004430754eda8970
Merge: 11c7f73 51a2551
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 17 16:15:57 2017 +0200

    Updated version 2.5 from 'upstream/2.5'
    
    with Debian dir 8019cd13f3a397a55c51b9b80e29761f1e65da4e

 .../invoker.properties => deploySite.sh            |   7 +-
 integration-test-archetype/pom.xml                 |  24 +-
 .../META-INF/maven/archetype-metadata.xml          |  22 +-
 .../main/resources/META-INF/maven/archetype.xml    |  22 +-
 .../src/main/resources/archetype-resources/pom.xml |  19 +
 .../archetype-resources/src/java/AppTest.java      |  19 +
 .../archetype-resources/src/main/assembly/bin.xml  |  20 +
 .../archetype-resources/src/main/java/App.java     |  19 +
 .../main/resources/archetype-resources/verify.bsh  |  19 +
 pom.xml                                            | 105 ++--
 required-docs.txt                                  |   9 -
 .../maven/plugin/assembly/AssemblyMojoTest.java    |  28 ++
 .../BasicAbstractAssemblyMojoFeaturesTest.java     |  22 +-
 .../interpolation/AssemblyInterpolatorTest.java    |  20 +
 .../plugin-configs/assembly/tbz2-plugin-config.xml |  86 ++++
 .../plugin-configs/assembly/tgz-plugin-config.xml  |  43 ++
 src/functional-tests/resources/assemblies/tbz2.xml |  32 ++
 src/functional-tests/resources/assemblies/tgz.xml  |  32 ++
 .../outputFileNameMapping-assemblyDescriptor.xml   |  22 +-
 src/it/it-project-parent/pom.xml                   |  19 +
 .../basic-features/ExecutionRoot/child/pom.xml     |  19 +
 .../projects/basic-features/ExecutionRoot/pom.xml  |  19 +
 .../ExecutionRoot/src/assemble/src.xml             |  20 +
 .../basic-features/ExecutionRoot/verify.bsh        |  19 +
 .../basic-features/add-classpath/assembly.xml      |  39 ++
 .../add-classpath}/invoker.properties              |   2 +-
 .../projects/basic-features/add-classpath/pom.xml  |  63 +++
 .../basic-features/add-classpath/verify.bsh}       |  30 +-
 .../basic-features/classpath-descriptor/pom.xml    |  20 +
 .../basic-features/descriptorDirectoryScan/pom.xml |  19 +
 .../descriptorDirectoryScan/src/assemble/bin.xml   |  20 +
 .../basic-features/file-copyIntoTopDir/pom.xml     |  19 +
 .../file-copyIntoTopDir/src/assemble/bin.xml       |  20 +
 .../basic-features/file-copyIntoTopDir/verify.bsh  |  19 +
 .../basic-features/file-sameName/a.properties      |  17 +
 .../projects/basic-features/file-sameName/pom.xml  |  19 +
 .../file-sameName/src/assemble/bin.xml             |  20 +
 .../basic-features/file-sameName/verify.bsh        |  19 +
 .../basic-features/formats-in-pom-win/pom.xml      |  19 +
 .../formats-in-pom-win/src/main/assembly/src.xml   |  22 +-
 .../basic-features/formats-in-pom-win/verify.bsh   |  21 +-
 .../formats/TODO.txt}                              |   0
 src/it/projects/basic-features/formats/goals.txt   |   1 +
 src/it/projects/basic-features/formats/pom.xml     |  50 ++
 .../formats/src/assemblies/format-test.xml         |  42 ++
 src/it/projects/basic-features/formats/verify.bsh  | 135 +++++
 .../basic-features/local-repo-interp/pom.xml       |  19 +
 .../local-repo-interp/src/main/assembly/bin.xml    |  20 +
 .../basic-features/local-repo-interp/verify.bsh    |  19 +
 .../massembly-256-pomPropertiesInterp/pom.xml      |  19 +
 .../src/main/assembly/myassembly.xml               |  20 +
 .../massembly-256-pomPropertiesInterp/verify.bsh   |  19 +
 .../massembly-351-projectPrefixInterp/pom.xml      |  19 +
 .../src/main/assembly/myassembly.xml               |  20 +
 .../massembly-351-projectPrefixInterp/verify.bsh   |  19 +
 .../outputFileNameMapping-simple/pom.xml           |  19 +
 .../src/assemble/bin.xml                           |  20 +
 .../pom.xml                                        |  19 +
 .../plexus-utils/1.3-SNAPSHOT/maven-metadata.xml   |  22 +-
 .../plexus/plexus-utils/maven-metadata.xml         |  22 +-
 .../src/assemble/bin.xml                           |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../verify.bsh                                     |  19 +
 .../basic-features/relative-project-paths/pom.xml  |  20 +
 .../relative-project-paths/src/assemble/src.xml    |  20 +
 .../relative-project-paths/verify.bsh              |  19 +
 src/it/projects/basic-features/this & that/pom.xml |  20 +
 .../this & that/src/main/assembly/src.xml          |  22 +-
 .../projects/basic-features/this & that/verify.bsh |  21 +-
 src/it/projects/bugs/massembly-190/child-1/pom.xml |  20 +
 src/it/projects/bugs/massembly-190/child-2/pom.xml |  20 +
 src/it/projects/bugs/massembly-190/pom.xml         |  22 +-
 .../bugs/massembly-190/src/main/assembly/bin.xml   |  20 +
 src/it/projects/bugs/massembly-190/verify.bsh      |  19 +
 .../massembly-285/massembly-285-assembly/pom.xml   |  20 +
 .../src/main/assembly/bin.xml                      |  20 +
 .../src/main/java/tests/App.java                   |  20 +
 .../massembly-285-assembly/verify.bsh              |  19 +
 .../bugs/massembly-285/massembly-285-mod1/pom.xml  |  22 +-
 .../src/main/java/tests/App.java                   |  20 +
 .../src/test/java/tests/AppTest.java               |  20 +
 .../bugs/massembly-285/massembly-285-mod2/pom.xml  |  22 +-
 .../src/main/java/tests/App.java                   |  20 +
 .../src/test/java/tests/AppTest.java               |  20 +
 src/it/projects/bugs/massembly-285/pom.xml         |  22 +-
 src/it/projects/bugs/massembly-285/verify.bsh      |  21 +-
 src/it/projects/bugs/massembly-306/pom.xml         |  20 +
 src/it/projects/bugs/massembly-375/pom.xml         |  20 +
 .../bugs/massembly-375/src/main/assembly/test.xml  |  20 +
 src/it/projects/bugs/massembly-375/verify.bsh      |  19 +
 src/it/projects/bugs/massembly-462/pom.xml         |  20 +
 .../bugs/massembly-462/src/main/assembly/src.xml   |  20 +
 .../bugs/massembly-462/src/main/java/test/App.java |  20 +
 src/it/projects/bugs/massembly-462/verify.bsh      |  19 +
 .../components/component-dependencySet/pom.xml     |  20 +
 .../src/main/assembly/bin.xml                      |  22 +-
 .../src/main/assembly/depset.xml                   |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../components/component-moduleSet/child1/pom.xml  |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../components/component-moduleSet/child2/pom.xml  |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/assemble/modset.xml                 |  22 +-
 .../components/component-moduleSet/pom.xml         |  20 +
 .../configured-handler/pom.xml                     |  20 +
 .../configured-handler/src/assemble/bin.xml        |  20 +
 .../configured-handler/verify.bsh                  |  19 +
 .../assembly/a.properties                          |  17 +
 .../assembly/pom.xml                               |  20 +
 .../assembly/src/assemble/bin.xml                  |  20 +
 .../handler-def/pom.xml                            |  20 +
 .../main/resources/META-INF/plexus/components.xml  |  22 +-
 .../custom-containerDescriptorHandler/pom.xml      |  20 +
 .../custom-containerDescriptorHandler/verify.bsh   |  19 +
 .../assembly/a.properties                          |  17 +
 .../assembly/pom.xml                               |  20 +
 .../assembly/src/assemble/bin.xml                  |  20 +
 .../handler-def/pom.xml                            |  20 +
 .../main/resources/META-INF/plexus/components.xml  |  22 +-
 .../custom-handler-withFileEntries/pom.xml         |  20 +
 .../custom-handler-withFileEntries/verify.bsh      |  19 +
 .../assembly/a.properties                          |  17 +
 .../assembly/pom.xml                               |  20 +
 .../assembly/src/assemble/bin.xml                  |  20 +
 .../handler-def/pom.xml                            |  20 +
 .../main/resources/META-INF/plexus/components.xml  |  22 +-
 .../custom-handler-withMixedEntries/pom.xml        |  20 +
 .../custom-handler-withMixedEntries/verify.bsh     |  19 +
 .../metaInf-services-aggregation/child1/pom.xml    |  22 +-
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../metaInf-services-aggregation/child2/pom.xml    |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../metaInf-services-aggregation/pom.xml           |  22 +-
 .../metaInf-services-aggregation/verify.bsh        |  19 +
 .../metaInf-spring-aggregation/child1/pom.xml      |  22 +-
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../metaInf-spring-aggregation/child2/pom.xml      |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../metaInf-spring-aggregation/pom.xml             |  22 +-
 .../metaInf-spring-aggregation/verify.bsh          |  19 +
 .../dep-transfilter-wildcard-massembly544/pom.xml  |  20 +
 .../src/main/assembly/bin.xml                      |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../verify.bsh                                     |  19 +
 .../dep-with-transitive-filter/pom.xml             |  20 +
 .../src/main/assembly/bin.xml                      |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../dep-with-transitive-filter/verify.bsh          |  19 +
 .../dependency-sets/depMgmt-override/child/pom.xml |  20 +
 .../depMgmt-override/child/src/assembly/bundle.xml |  20 +
 .../dependency-sets/depMgmt-override/pom.xml       |  20 +
 .../dependency-sets/depMgmt-override/verify.bsh    |  21 +-
 .../depSet-artifactPomPropInterp/child1/pom.xml    |  22 +-
 .../depSet-artifactPomPropInterp/child2/pom.xml    |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../depSet-artifactPomPropInterp/pom.xml           |  22 +-
 .../depSet-artifactPomPropInterp/verify.bsh        |  21 +-
 .../depSet-byDepVersion/child1/pom.xml             |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../depSet-byDepVersion/child2/pom.xml             |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../depSet-byDepVersion/child3/pom.xml             |  20 +
 .../child3/src/main/assembly/bin.xml               |  22 +-
 .../dependency-sets/depSet-byDepVersion/pom.xml    |  20 +
 .../dependency-sets/depSet-byDepVersion/verify.bsh |  19 +
 .../depSet-enum-vs-wildcard/enum/pom.xml           |  20 +
 .../enum/src/main/assembly/bin.xml                 |  20 +
 .../depSet-enum-vs-wildcard/pom.xml                |  20 +
 .../depSet-enum-vs-wildcard/verify.bsh             |  19 +
 .../depSet-enum-vs-wildcard/wildcard/pom.xml       |  20 +
 .../wildcard/src/main/assembly/bin.xml             |  20 +
 .../depSet-runtimeScope/child1/pom.xml             |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../depSet-runtimeScope/child2/pom.xml             |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../depSet-runtimeScope/child3/pom.xml             |  20 +
 .../child3/src/main/assembly/bin.xml               |  22 +-
 .../dependency-sets/depSet-runtimeScope/pom.xml    |  20 +
 .../dependency-sets/depSet-runtimeScope/verify.bsh |  19 +
 .../depSet-transFromProfile/child1/pom.xml         |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../depSet-transFromProfile/child2/pom.xml         |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../depSet-transFromProfile/child3/pom.xml         |  20 +
 .../child3/src/main/java/test/App.java             |  20 +
 .../depSet-transFromProfile/child4/pom.xml         |  20 +
 .../child4/src/main/assembly/bin.xml               |  20 +
 .../child4/src/main/java/test/App.java             |  20 +
 .../depSet-transFromProfile/pom.xml                |  20 +
 .../depSet-transFromProfile/test.properties        |  19 +-
 .../depSet-transFromProfile/verify.bsh             |  19 +
 .../depSet-unpacked-rdonly/child1/pom.xml          |  22 +-
 .../depSet-unpacked-rdonly/child2/pom.xml          |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../dependency-sets/depSet-unpacked-rdonly/pom.xml |  22 +-
 .../depSet-unpacked-rdonly/verify.bsh              |  19 +
 .../dependencySet-matchScope/child1/pom.xml        |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-matchScope/child2/pom.xml        |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-matchScope/pom.xml               |  20 +
 .../dependencySet-matchScope/verify.bsh            |  19 +
 .../dependencySet-nonTransitive/child1/pom.xml     |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-nonTransitive/child2/pom.xml     |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../dependencySet-nonTransitive/pom.xml            |  20 +
 .../dependencySet-nonTransitive/verify.bsh         |  19 +
 .../dependencySet-notUnpacked/child1/pom.xml       |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-notUnpacked/child2/pom.xml       |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-notUnpacked/pom.xml              |  20 +
 .../dependencySet-notUnpacked/verify.bsh           |  19 +
 .../pom.xml                                        |  20 +
 .../src/assembly/bin.xml                           |  20 +
 .../src/main/java/foo/Foo.java                     |  22 +-
 .../src/main/webapp/WEB-INF/web.xml                |  20 +
 .../verify.bsh                                     |  19 +
 .../dependencySet-unpacked-filtered/child1/pom.xml |  22 +-
 .../dependencySet-unpacked-filtered/child2/pom.xml |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../dependencySet-unpacked-filtered/pom.xml        |  22 +-
 .../dependencySet-unpacked-filtered/verify.bsh     |  19 +
 .../dependencySet-unpacked/child1/pom.xml          |  22 +-
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-unpacked/child2/pom.xml          |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../dependency-sets/dependencySet-unpacked/pom.xml |  22 +-
 .../dependencySet-unpacked/verify.bsh              |  19 +
 .../child1/pom.xml                                 |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../child2/pom.xml                                 |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-unpackedExcludingMetaInf/pom.xml |  21 +
 .../verify.bsh                                     |  19 +
 .../child1/pom.xml                                 |  22 +-
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/main/java/test/App2.java            |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../child2/pom.xml                                 |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../dependencySet-unpackedSubsetsTwice/pom.xml     |  22 +-
 .../dependencySet-unpackedSubsetsTwice/verify.bsh  |  19 +
 .../child1/pom.xml                                 |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../child2/pom.xml                                 |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../dependencySet-withExecutedProject/pom.xml      |  20 +
 .../src/assemble/bin.xml                           |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../dependencySet-withExecutedProject/verify.bsh   |  19 +
 .../include-project-artifact/pom.xml               |  20 +
 .../src/main/assembly/bin.xml                      |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../include-project-artifact/verify.bsh            |  19 +
 .../include-project-attachments/pom.xml            |  20 +
 .../src/main/assembly/bin.xml                      |  20 +
 .../src/main/assembly/src.xml                      |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../include-project-attachments/verify.bsh         |  19 +
 .../include-provided/child1/pom.xml                |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../include-provided/child2/pom.xml                |  20 +
 .../include-provided/child2/src/assemble/bin.xml   |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../dependency-sets/include-provided/pom.xml       |  20 +
 .../dependency-sets/include-provided/verify.bsh    |  19 +
 .../including-pom-dependency/pom.xml               |  20 +
 .../including-pom-dependency/src/assemble/bin.xml  |  20 +
 .../src/main/java/com/nf/ass/App.java              |  20 +
 .../including-pom-dependency/verify.bsh            |  19 +
 .../including-sar-dependency/pom.xml               |  20 +
 .../including-sar-dependency/src/assemble/bin.xml  |  20 +
 .../src/main/java/com/nf/ass/App.java              |  20 +
 .../including-sar-dependency/verify.bsh            |  19 +
 .../projects/dependency-sets/massembly-201/pom.xml |  20 +
 .../massembly-201/src/main/assembly/bin.xml        |  20 +
 .../massembly-201/src/main/java/test/App.java      |  20 +
 .../dependency-sets/massembly-201/verify.bsh       |  21 +-
 .../dependency-sets/massembly-232/assembly.xml     |  20 +
 .../projects/dependency-sets/massembly-232/pom.xml |  20 +
 .../dependency-sets/massembly-232/verify.bsh       |  19 +
 .../projects/dependency-sets/massembly-235/pom.xml |  22 +-
 .../massembly-235/src/main/assembly/release.xml    |  20 +
 .../massembly-235/src/main/java/HelloWorld.java    |  21 +-
 .../src/test/java/HelloWorldTest.java              |  21 +-
 .../dependency-sets/massembly-235/verify.bsh       |  19 +
 .../projects/dependency-sets/massembly-345/pom.xml |  20 +
 .../massembly-345/src/assemble/bin.xml             |  20 +
 .../src/main/resources/application.xml             |  22 +-
 .../dependency-sets/massembly-345/verify.bsh       |  19 +
 .../dependency-sets/massembly-99/module-a/pom.xml  |  20 +
 .../module-a/src/main/java/com/nf/ass/App.java     |  20 +
 .../module-a/src/test/java/com/nf/ass/AppTest.java |  20 +
 .../dependency-sets/massembly-99/module-b/pom.xml  |  20 +
 .../module-b/src/main/java/com/nf/ass/App.java     |  20 +
 .../module-b/src/test/java/com/nf/ass/AppTest.java |  20 +
 .../projects/dependency-sets/massembly-99/pom.xml  |  20 +
 .../massembly-99/src/main/assemblies/bin.xml       |  20 +
 .../dependency-sets/massembly-99/verify.bsh        |  19 +
 .../mid-artifactId-wildcard-massembly570/pom.xml   |  20 +
 .../src/main/assembly/bin.xml                      |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../verify.bsh                                     |  19 +
 .../multiple-wildcard-includes/pom.xml             |  20 +
 .../src/main/assembly/bin.xml                      |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../multiple-wildcard-includes/verify.bsh          |  19 +
 .../outputFileNameMappingWithUnpack/pom.xml        |  20 +
 .../src/main/assembly/bin.xml                      |  20 +
 .../outputFileNameMappingWithUnpack/verify.bsh     |  19 +
 .../module-a/pom.xml                               |  20 +
 .../module-a/src/main/java/com/nf/ass/App.java     |  20 +
 .../module-a/src/test/java/com/nf/ass/AppTest.java |  20 +
 .../module-b/pom.xml                               |  20 +
 .../module-b/src/main/java/com/nf/ass/App.java     |  20 +
 .../module-b/src/test/java/com/nf/ass/AppTest.java |  20 +
 .../using-moduleSet-implied-depSet/pom.xml         |  20 +
 .../src/main/assemblies/bin.xml                    |  20 +
 .../using-moduleSet-implied-depSet/verify.bsh      |  19 +
 .../bin/jars-in-archive-root/pom.xml               |  21 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../bin/jars-in-archive-root/verify.bsh            |  19 +
 .../component-descriptors-merged/child1/pom.xml    |  20 +
 .../child1/src/main/java/test/AppChild1.java       |  20 +
 .../main/resources/META-INF/plexus/components.xml  |  20 +
 .../component-descriptors-merged/child2/pom.xml    |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../main/resources/META-INF/plexus/components.xml  |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../component-descriptors-merged/pom.xml           |  20 +
 .../component-descriptors-merged/verify.bsh        |  19 +
 .../deps-unpacked-to-root-dir/child1/pom.xml       |  20 +
 .../child1/src/main/java/test/AppChild1.java       |  20 +
 .../deps-unpacked-to-root-dir/child2/pom.xml       |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../deps-unpacked-to-root-dir/pom.xml              |  20 +
 .../deps-unpacked-to-root-dir/verify.bsh           |  19 +
 .../jar-with-dependencies/no-target-dir/pom.xml    |  20 +
 .../no-target-dir/src/assemble/bin.xml             |  22 +-
 .../no-target-dir/src/main/java/test/App.java      |  20 +
 .../jar-with-dependencies/no-target-dir/verify.bsh |  19 +
 .../multimodule-sources-copied/child1/pom.xml      |  22 +-
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../multimodule-sources-copied/child2/pom.xml      |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../project/multimodule-sources-copied/pom.xml     |  21 +
 .../project/multimodule-sources-copied/verify.bsh  |  19 +
 .../no-target-dir-multimodule/child1/pom.xml       |  22 +-
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../no-target-dir-multimodule/child2/pom.xml       |  22 +-
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../project/no-target-dir-multimodule/pom.xml      |  21 +
 .../project/no-target-dir-multimodule/verify.bsh   |  19 +
 .../descriptor-refs/project/no-target-dir/pom.xml  |  21 +
 .../no-target-dir/src/main/java/test/App.java      |  20 +
 .../no-target-dir/src/test/java/test/AppTest.java  |  20 +
 .../project/no-target-dir/verify.bsh               |  19 +
 .../descriptor-refs/project/sources-copied/pom.xml |  21 +
 .../sources-copied/src/main/java/test/App.java     |  20 +
 .../sources-copied/src/test/java/test/AppTest.java |  20 +
 .../project/sources-copied/verify.bsh              |  19 +
 .../descriptor-refs/src/no-target-dir/pom.xml      |  21 +
 .../src/no-target-dir/src/main/java/test/App.java  |  20 +
 .../no-target-dir/src/test/java/test/AppTest.java  |  20 +
 .../descriptor-refs/src/no-target-dir/verify.bsh   |  19 +
 .../descriptor-refs/src/src-dir-copied/pom.xml     |  21 +
 .../src/src-dir-copied/src/main/java/test/App.java |  20 +
 .../src-dir-copied/src/test/java/test/AppTest.java |  20 +
 .../descriptor-refs/src/src-dir-copied/verify.bsh  |  19 +
 .../projects/file-modes/file-set-fileMode/pom.xml  |  20 +
 .../file-set-fileMode/src/assemble/src.xml         |  20 +
 .../file-set-fileMode/src/main/java/test/App.java  |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../file-modes/file-set-fileMode/verify.bsh        |  19 +
 .../projects/file-modes/fileItem-fileMode/pom.xml  |  20 +
 .../fileItem-fileMode/src/assemble/src.xml         |  20 +
 .../fileItem-fileMode/src/main/java/test/App.java  |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../file-modes/fileItem-fileMode/verify.bsh        |  19 +
 .../default-directory-unspecified/pom.xml          |  20 +
 .../src/main/assembly/src.xml                      |  20 +
 .../default-directory-unspecified/verify.bsh       |  19 +
 .../file-sets/default-excludes-unspecified/pom.xml |  20 +
 .../src/main/assembly/src.xml                      |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../default-excludes-unspecified/verify.bsh        |  19 +
 .../file-sets/dont-use-default-excludes/pom.xml    |  20 +
 .../file-sets/dont-use-default-excludes/setup.bsh  |  21 +-
 .../src/main/assembly/src.xml                      |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../dont-use-default-excludes/verify.groovy        |  19 +
 .../file-sets/excludes-using-regex/child/pom.xml   |  20 +
 .../file-sets/excludes-using-regex/pom.xml         |  20 +
 .../excludes-using-regex/src/assemble/src.xml      |  20 +
 .../src/main/java/org/test/target/file.properties  |  17 +
 .../file-sets/excludes-using-regex/verify.bsh      |  19 +
 .../projects/file-sets/excluding-svn-dirs/pom.xml  |  20 +
 .../file-sets/excluding-svn-dirs/setup.bsh         |  21 +-
 .../excluding-svn-dirs/src/main/assembly/src.xml   |  20 +
 .../excluding-svn-dirs/src/main/java/test/App.java |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../file-sets/excluding-svn-dirs/verify.groovy     |  19 +
 .../filtered-module-sources/child/pom.xml          |  20 +
 .../file-sets/filtered-module-sources/pom.xml      |  20 +
 .../src/main/assembly/src.xml                      |  20 +
 .../file-sets/filtered-module-sources/verify.bsh   |  21 +-
 .../file-sets/filtered-multimodule/child/pom.xml   |  20 +
 .../child/src/main/assembly/src.xml                |  20 +
 .../file-sets/filtered-multimodule/pom.xml         |  20 +
 .../filtered-multimodule/src/main/assembly/bin.xml |  20 +
 .../org/apache/maven/plugin/assembly/test/App.java |  20 +
 .../file-sets/filtered-multimodule/verify.bsh      |  21 +-
 .../file-sets/include-base-directory/pom.xml       |  20 +
 .../src/main/assembly/src.xml                      |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../file-sets/include-base-directory/verify.bsh    |  19 +
 .../file-sets/include-parent-dir/child/pom.xml     |  20 +
 .../child/src/assemble/parent.xml                  |  20 +
 .../child/src/main/java/test/App.java              |  20 +
 .../child/src/test/java/test/AppTest.java          |  20 +
 .../projects/file-sets/include-parent-dir/pom.xml  |  22 +-
 .../file-sets/include-parent-dir/verify.bsh        |  19 +
 .../multimodule-unix-lineEndings/child/pom.xml     |  21 +
 .../child/src/main/assembly/src.xml                |  20 +
 .../file-sets/multimodule-unix-lineEndings/pom.xml |  21 +
 .../src/main/assembly/bin.xml                      |  20 +
 .../org/apache/maven/plugin/assembly/test/App.java |  20 +
 .../multimodule-unix-lineEndings/verify.bsh        |  21 +-
 .../multimodule-win-lineEndings/child/pom.xml      |  20 +
 .../child/src/main/assembly/src.xml                |  20 +
 .../file-sets/multimodule-win-lineEndings/pom.xml  |  21 +
 .../src/main/assembly/bin.xml                      |  20 +
 .../org/apache/maven/plugin/assembly/test/App.java |  20 +
 .../multimodule-win-lineEndings/verify.bsh         |  21 +-
 .../file-sets/use-default-excludes/pom.xml         |  20 +
 .../use-default-excludes/src/main/assembly/src.xml |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../file-sets/use-default-excludes/verify.bsh      |  19 +
 src/it/projects/files/filtered-sysprop/pom.xml     |  20 +
 .../files/filtered-sysprop/src/assemble/bin.xml    |  20 +
 src/it/projects/files/filtered-sysprop/verify.bsh  |  19 +
 .../files/multimodule-relativePath/a.properties    |  17 +
 .../files/multimodule-relativePath/child/pom.xml   |  20 +
 .../child/src/assemble/bin.xml                     |  20 +
 .../files/multimodule-relativePath/pom.xml         |  20 +
 .../files/multimodule-relativePath/verify.bsh      |  19 +
 .../filter-comp-descriptor-path/assembly.xml       |  20 +
 .../filter-comp-descriptor-path/component.xml      |  20 +
 .../filter-comp-descriptor-path/pom.xml            |  20 +
 .../filter-comp-descriptor-path/verify.bsh         |  19 +
 .../filters-defined-in-build/invoker.properties    |   1 -
 .../filters-defined-in-build/pom.xml               |  20 +
 .../src/main/assembly/descriptor.xml               |  22 +-
 .../src/main/config/file-2.properties              |  19 +-
 .../src/main/filters/filter-assembly.properties    |  19 +-
 .../src/main/filters/filter-build.properties       |  19 +-
 .../filters-defined-in-build/verify.bsh            |  19 +
 .../filter.properties                              |  17 +
 .../filtersDefinedInAssemblyPluginConfig/pom.xml   |  22 +-
 .../src/assemble/bin.xml                           |  20 +
 .../verify.bsh                                     |  19 +
 .../child1/pom.xml                                 |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../child2/pom.xml                                 |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../assembly-assembly-with-module-binaries/pom.xml |  22 +-
 .../src/assemble/bin.xml                           |  22 +-
 .../test.properties                                |  17 +
 .../verify.bsh                                     |  19 +
 .../child1/pom.xml                                 |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../child2/pom.xml                                 |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../assembly-attached-with-module-binaries/pom.xml |  22 +-
 .../src/assemble/bin.xml                           |  22 +-
 .../test.properties                                |  17 +
 .../verify.bsh                                     |  19 +
 .../archiver-ignorePermissions/pom.xml             |  20 +
 .../src/main/assembly/bin.xml                      |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../archiver-ignorePermissions/verify.bsh          |  21 +-
 .../ignoreDirFormatExtensions/pom.xml              |  20 +
 .../src/main/assembly/src.xml                      |  22 +-
 .../src/main/assembly/src2.xml                     |  22 +-
 .../src/main/java/test/App.java                    |  20 +
 .../ignoreDirFormatExtensions/verify.bsh           |  21 +-
 .../manifest-with-customEntry/pom.xml              |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../manifest-with-customEntry/verify.bsh           |  19 +
 .../manifest-with-mainClass/pom.xml                |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../manifest-with-mainClass/verify.bsh             |  19 +
 .../mojo-configuration/massembly-291/pom.xml       |  21 +
 .../massembly-291/src/main/assembly/src.xml        |  22 +-
 .../massembly-291/test.properties                  |  17 +
 .../mojo-configuration/massembly-291/verify.bsh    |  21 +-
 .../mojo-configuration/massembly-301/pom.xml       |  21 +
 .../massembly-301/src/main/assembly/src.xml        |  22 +-
 .../massembly-301/src/main/java/test/App.java      |  20 +
 .../massembly-301/test.properties                  |  19 +-
 .../mojo-configuration/massembly-301/verify.bsh    |  21 +-
 .../no-appendAssemblyId-no-classifier/pom.xml      |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../no-appendAssemblyId-no-classifier/verify.bsh   |  21 +-
 .../skipAssemblyCLIPropertySet/pom.xml             |  20 +
 .../src/main/assembly/bin.xml                      |  20 +
 .../skipAssemblyCLIPropertySet/test.properties     |  19 +-
 .../skipAssemblyCLIPropertySet/verify.bsh          |  21 +-
 .../single-in-one-project-hierarchy/pom.xml        |  20 +
 .../src/assemble/bin.xml                           |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../single-in-one-project-hierarchy/verify.bsh     |  19 +
 .../child1/pom.xml                                 |  20 +
 .../child1/src/assemble/bin.xml                    |  20 +
 .../child1/src/main/java/test/App.java             |  20 +
 .../child1/src/test/java/test/AppTest.java         |  20 +
 .../child2/pom.xml                                 |  20 +
 .../child2/src/assemble/bin.xml                    |  20 +
 .../child2/src/main/java/test/App.java             |  20 +
 .../child2/src/test/java/test/AppTest.java         |  20 +
 .../single-twice-in-multimodule-hierarchy/pom.xml  |  20 +
 .../verify.bsh                                     |  19 +
 .../single-twice-in-one-project-hierarchy/pom.xml  |  20 +
 .../src/assemble/bin.xml                           |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../verify.bsh                                     |  19 +
 .../multimodule/massembly-298/child1/pom.xml       |  22 +-
 .../child1/src/main/java/org/test/child1/App.java  |  20 +
 .../child1/src/main/java/org/test/child1/App2.java |  20 +
 .../child1/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule/massembly-298/child2/pom.xml       |  22 +-
 .../child2/src/main/java/org/test/child2/App.java  |  20 +
 .../child2/src/main/java/org/test/other/App.java   |  20 +
 .../child2/src/test/java/org/test/AppTest.java     |  20 +
 src/it/projects/multimodule/massembly-298/pom.xml  |  20 +
 .../multimodule/massembly-298/src/assemble/bin.xml |  20 +
 .../projects/multimodule/massembly-298/verify.bsh  |  19 +
 .../multimodule-binariesNotSource/child1/pom.xml   |  22 +-
 .../child1/src/main/java/org/test/App.java         |  20 +
 .../child1/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-binariesNotSource/child2/pom.xml   |  22 +-
 .../child2/src/main/java/org/test/App.java         |  20 +
 .../child2/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-binariesNotSource/child3/pom.xml   |  22 +-
 .../child3/src/main/java/org/test/App.java         |  20 +
 .../child3/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-binariesNotSource/pom.xml          |  20 +
 .../src/assemble/bin.xml                           |  20 +
 .../multimodule-binariesNotSource/verify.bsh       |  19 +
 .../multimodule-filteredFileSet/child/pom.xml      |  20 +
 .../multimodule-filteredFileSet/child/verify.bsh   |  19 +
 .../multimodule-filteredFileSet/pom.xml            |  20 +
 .../src/assemble/bin.xml                           |  20 +
 .../multimodule-filteredFileSet/verify.bsh         |  19 +
 .../multimodule-modulePomPropInterp/child1/pom.xml |  22 +-
 .../multimodule-modulePomPropInterp/child2/pom.xml |  20 +
 .../child2/src/assemble/bin.xml                    |  22 +-
 .../multimodule-modulePomPropInterp/pom.xml        |  22 +-
 .../multimodule-modulePomPropInterp/verify.bsh     |  19 +
 .../multimodule-siblingParent/child1/pom.xml       |  22 +-
 .../child1/src/main/java/org/test/App.java         |  20 +
 .../child1/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-siblingParent/child2/pom.xml       |  22 +-
 .../child2/src/main/java/org/test/App.java         |  20 +
 .../child2/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-siblingParent/parent/pom.xml       |  22 +-
 .../parent/src/assemble/src.xml                    |  20 +
 .../multimodule-siblingParent/parent/verify.bsh    |  19 +
 .../multimodule-sourceNotBinaries/child1/pom.xml   |  22 +-
 .../child1/src/main/java/org/test/App.java         |  20 +
 .../child1/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-sourceNotBinaries/child2/pom.xml   |  22 +-
 .../child2/src/main/java/org/test/App.java         |  20 +
 .../child2/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-sourceNotBinaries/child3/pom.xml   |  22 +-
 .../child3/src/main/java/org/test/App.java         |  20 +
 .../child3/src/test/java/org/test/AppTest.java     |  20 +
 .../multimodule-sourceNotBinaries/pom.xml          |  20 +
 .../src/assemble/src.xml                           |  20 +
 .../multimodule-sourceNotBinaries/verify.bsh       |  19 +
 .../child1/pom.xml                                 |  22 +-
 .../child1/src/main/java/org/test/App.java         |  20 +
 .../child1/src/test/java/org/test/AppTest.java     |  20 +
 .../child2/pom.xml                                 |  22 +-
 .../child2/src/main/java/org/test/App.java         |  20 +
 .../child2/src/test/java/org/test/AppTest.java     |  20 +
 .../child3/pom.xml                                 |  22 +-
 .../child3/src/main/java/org/test/App.java         |  20 +
 .../child3/src/test/java/org/test/AppTest.java     |  20 +
 .../child4/pom.xml                                 |  22 +-
 .../child4/src/assemble/bin.xml                    |  20 +
 .../multimodule-wholeReactorFromChild/pom.xml      |  20 +
 .../multimodule-wholeReactorFromChild/verify.bsh   |  19 +
 .../child-level1-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level2-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level1-project2/pom.xml                  |  20 +
 .../pom.xml                                        |  20 +
 .../src/assemble/bin.xml                           |  20 +
 .../verify.bsh                                     |  19 +
 .../child-level1-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level2-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level1-project2/pom.xml                  |  20 +
 .../multimodule/two-level-multimodule/pom.xml      |  20 +
 .../two-level-multimodule/src/assemble/bin.xml     |  20 +
 .../multimodule/two-level-multimodule/verify.bsh   |  19 +
 .../child-level1-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level2-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level1-project2/pom.xml                  |  20 +
 .../two-levels-includeBaseDir-withBin/pom.xml      |  20 +
 .../src/assemble/bin.xml                           |  20 +
 .../two-levels-includeBaseDir-withBin/verify.bsh   |  19 +
 .../child-level1-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level2-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level1-project2/pom.xml                  |  20 +
 .../two-levels-includeBaseDir-withSrc/pom.xml      |  20 +
 .../src/assemble/src.xml                           |  20 +
 .../two-levels-includeBaseDir-withSrc/verify.bsh   |  19 +
 .../child-level1-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level2-project1/pom.xml                  |  20 +
 .../src/main/java/test/App2.java                   |  20 +
 .../src/test/java/test/App2Test.java               |  20 +
 .../child-level1-project2/pom.xml                  |  20 +
 .../pom.xml                                        |  20 +
 .../src/main/assembly/src.xml                      |  20 +
 .../verify.bsh                                     |  19 +
 .../child-level1-project1/pom.xml                  |  20 +
 .../src/main/java/test/App.java                    |  20 +
 .../src/test/java/test/AppTest.java                |  20 +
 .../child-level2-project1/pom.xml                  |  20 +
 .../src/main/java/test/App2.java                   |  20 +
 .../src/test/java/test/App2Test.java               |  20 +
 .../child-level1-project2/pom.xml                  |  20 +
 .../pom.xml                                        |  20 +
 .../src/main/assembly/src.xml                      |  20 +
 .../verify.bsh                                     |  19 +
 .../projects/repositories/basic-repository/pom.xml |  20 +
 .../basic-repository/src/assemble/bin.xml          |  20 +
 .../org/apache/maven/plugin/assembly/test/App.java |  20 +
 .../apache/maven/plugin/assembly/test/AppTest.java |  20 +
 .../repositories/basic-repository/verify.bsh       |  19 +
 src/it/projects/repositories/massembly-196/pom.xml |  20 +
 .../massembly-196/src/main/assembly/bin.xml        |  20 +
 .../massembly-196/src/main/java/test/App.java      |  20 +
 .../projects/repositories/massembly-196/verify.bsh |  19 +
 .../repo-with-snapshot-parents/child/pom.xml       |  20 +
 .../child/src/assemble/bin.xml                     |  20 +
 .../org/apache/maven/plugin/assembly/test/App.java |  20 +
 .../apache/maven/plugin/assembly/test/AppTest.java |  20 +
 .../repo-with-snapshot-parents/pom.xml             |  20 +
 .../repo-with-snapshot-parents/verify.bsh          |  19 +
 .../assembly/AssemblerConfigurationSource.java     | 120 ++++-
 .../InvalidAssemblerConfigurationException.java    |   9 +-
 .../assembly/archive/ArchiveCreationException.java |  10 +-
 .../archive/ArchiveExpansionException.java         |   9 +-
 .../plugin/assembly/archive/AssemblyArchiver.java  |  24 +-
 .../assembly/archive/DefaultAssemblyArchiver.java  | 129 ++---
 .../archive/ManifestCreationFinalizer.java         |   6 +-
 .../archive/archiver/AssemblyProxyArchiver.java    | 238 +++++++--
 .../archive/archiver/PrefixedArchivedFileSet.java  |  46 +-
 .../assembly/archive/archiver/PrefixedFileSet.java |  45 +-
 .../assembly/archive/archiver/SarUnArchiver.java   |   4 +-
 .../archive/phase/AssemblyArchiverPhase.java       |  23 +-
 .../archive/phase/DependencySetAssemblyPhase.java  |  18 +-
 .../archive/phase/FileItemAssemblyPhase.java       |  53 +-
 .../archive/phase/FileSetAssemblyPhase.java        |  11 +-
 .../archive/phase/ModuleSetAssemblyPhase.java      | 185 ++++---
 .../archive/phase/RepositoryAssemblyPhase.java     |  57 ++-
 .../wrappers/GroupVersionAlignmentWrapper.java     |  10 +-
 .../archive/phase/wrappers/RepoInfoWrapper.java    |  16 +-
 .../assembly/archive/task/AddArtifactTask.java     |  13 +-
 .../archive/task/AddDependencySetsTask.java        | 121 +++--
 .../assembly/archive/task/AddDirectoryTask.java    |  55 ++-
 .../assembly/archive/task/AddFileSetsTask.java     |  63 +--
 .../artifact/DefaultDependencyResolver.java        | 277 +++++------
 .../artifact/DependencyResolutionException.java    |   5 -
 .../assembly/artifact/DependencyResolver.java      |  15 +-
 .../artifact/ResolutionManagementInfo.java         |   4 -
 .../filter/AbstractLineAggregatingHandler.java     |  12 +-
 .../filter/ComponentsXmlArchiverFileFilter.java    |  55 ++-
 .../assembly/filter/MetaInfServicesHandler.java    |   2 +-
 .../assembly/filter/MetaInfSpringHandler.java      |   2 +-
 .../filter/SimpleAggregatingDescriptorHandler.java |  75 +--
 .../plugin/assembly/format/FileFormatter.java      |  90 ++--
 .../plugin/assembly/format/FileSetFormatter.java   | 132 -----
 .../plugin/assembly/format/ReaderFormatter.java    | 144 ++++++
 .../assembly/format/ReflectionProperties.java      |   4 +-
 .../interpolation/AssemblyExpressionEvaluator.java |   4 +-
 .../AssemblyInterpolationException.java            |  28 +-
 .../interpolation/AssemblyInterpolator.java        |  27 +-
 .../plugin/assembly/io/DefaultAssemblyReader.java  | 138 +++---
 .../io/PrefixedClasspathLocatorStrategy.java       |   4 +-
 .../assembly/io/RelativeFileLocatorStrategy.java   |   6 +-
 .../assembly/mojos/AbstractAssemblyMojo.java       | 246 +++++----
 .../maven/plugin/assembly/mojos/AssemblyMojo.java  |   2 +-
 .../assembly/mojos/AttachedAssemblyMojo.java       |   6 +-
 .../plugin/assembly/mojos/DirectoryInlineMojo.java |   6 +-
 .../maven/plugin/assembly/mojos/DirectoryMojo.java |   2 +-
 .../plugin/assembly/mojos/DirectorySingleMojo.java |   6 +-
 .../plugin/assembly/mojos/SingleAssemblyMojo.java  |   9 +-
 .../maven/plugin/assembly/mojos/UnpackMojo.java    |  36 +-
 .../AssemblyId.java}                               |  29 +-
 .../plugin/assembly/resolved/ResolvedAssembly.java | 109 ++++
 .../ResolvedModuleSet.java}                        |  45 +-
 .../functions/ResolvedModuleSetConsumer.java}      |  18 +-
 .../plugin/assembly/utils/AssemblyFileUtils.java   | 193 +-------
 .../plugin/assembly/utils/AssemblyFormatUtils.java |  54 +-
 .../maven/plugin/assembly/utils/FilterUtils.java   |  36 +-
 .../LineEndings.java}                              |  38 +-
 ...ssemblyFileUtils.java => LineEndingsUtils.java} | 204 +++-----
 .../assembly/utils/LinuxLineFeedInputStream.java   | 109 ++++
 .../plugin/assembly/utils/TypeConversionUtils.java |  12 +-
 .../assembly/utils/WindowsLineFeedInputStream.java | 130 +++++
 src/main/mdo/descriptor.mdo                        |   4 +-
 src/main/resources/META-INF/plexus/components.xml  |  14 -
 src/site/apt/features.apt                          |   2 +-
 src/site/apt/index.apt.vm                          |   4 +-
 .../index.html                                     |  18 +
 .../archive/DefaultAssemblyArchiverTest.java       | 548 +++++++--------------
 .../archive/ManifestCreationFinalizerTest.java     |  35 +-
 .../phase/DependencySetAssemblyPhaseTest.java      |  31 +-
 .../archive/phase/FileItemAssemblyPhaseTest.java   |  92 ++--
 .../archive/phase/FileSetAssemblyPhaseTest.java    |  48 +-
 .../archive/phase/ModuleSetAssemblyPhaseTest.java  | 118 ++---
 .../archive/phase/RepositoryAssemblyPhaseTest.java | 198 ++------
 .../assembly/archive/task/AddArtifactTaskTest.java |  12 +-
 .../archive/task/AddDependencySetsTaskTest.java    |   7 +-
 .../archive/task/AddDirectoryTaskTest.java         |  40 +-
 .../assembly/archive/task/AddFileSetsTaskTest.java |  21 +-
 .../archive/task/testutils/ArtifactMock.java       | 108 ++--
 .../MockAndControlForAddArtifactTask.java          |  74 +--
 .../MockAndControlForAddDependencySetsTask.java    | 102 ++--
 .../MockAndControlForAddFileSetsTask.java          |  95 ++--
 .../artifact/DefaultDependencyResolverTest.java    |  56 +--
 .../ComponentsXmlArchiverFileFilterTest.java       |  87 ++--
 .../plugin/assembly/format/FileFormatterTest.java  | 276 ++++++++---
 .../assembly/format/FileSetFormatterTest.java      | 364 --------------
 .../AssemblyExpressionEvaluatorTest.java           |  65 +--
 .../interpolation/AssemblyInterpolatorTest.java    |  37 +-
 .../assembly/io/DefaultAssemblyReaderTest.java     | 180 +++----
 .../assembly/testutils/ConfigSourceStub.java       |  21 +-
 .../plugin/assembly/testutils/MockManager.java     |  67 ---
 .../plugin/assembly/testutils/TestFileManager.java |  46 +-
 .../maven/plugin/assembly/testutils/TestUtils.java |  90 ----
 .../assembly/testutils/TrackingArchiverStub.java   |  63 ++-
 .../assembly/utils/AssemblyFileUtilsTest.java      | 253 +---------
 .../assembly/utils/AssemblyFormatUtilsTest.java    |  95 ++--
 .../plugin/assembly/utils/FilterUtilsTest.java     |  77 ++-
 ...ileUtilsTest.java => LineEndingsUtilsTest.java} | 167 +++----
 .../utils/LinuxLineFeedInputStreamTest.java        |  84 ++++
 .../plugin/assembly/utils/ProjectUtilsTest.java    |   4 +-
 .../utils/WindowsLineFeedInputStreamTest.java      |  93 ++++
 src/test/resources/assemblies/empty.xml            |  20 +
 830 files changed, 18200 insertions(+), 4059 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-assembly-plugin.git



More information about the pkg-java-commits mailing list