svn commit: r1691766 [1/2] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ it/projects/basic-features/classpath-descriptor/ it/projects/basic-features/descriptorDirectoryScan/ it/projects/bas...

Sat, 18 Jul 2015 11:59:53 -0700 

Author: krosenvold
Date: Sat Jul 18 18:59:37 2015
New Revision: 1691766

URL: http://svn.apache.org/r1691766
Log:
[MASSEMBLY-704]Removed all deprecated goals

Added:
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/bin.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/bin.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/bin.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/bin.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/bin.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/bin.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/main/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/main/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/main/assembly/bin.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
      - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml
Removed:
    
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/UnpackMojoTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/main/java/test/App.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/test/java/test/AppTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/main/java/test/App.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/main/java/test/App.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/test/java/test/AppTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractDirectoryMojo.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AssemblyMojo.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AttachedAssemblyMojo.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryInlineMojo.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryMojo.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectorySingleMojo.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/UnpackMojo.java
Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-739/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-1/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-1/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -28,7 +28,7 @@ under the License.
   </parent>
   <artifactId>child-1</artifactId>
   <packaging>jar</packaging>
-  
+
   <dependencies>
     <dependency>
       <groupId>commons-codec</groupId>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-2/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-2/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-2/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-2/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -28,19 +28,12 @@ under the License.
   </parent>
   <artifactId>child-2</artifactId>
   <packaging>jar</packaging>
-  
+
   <dependencies>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.2</version>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
-    </dependency>
-    -->
   </dependencies>
 </project>

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/pom.xml?rev=1691766&view=auto
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ /*
+  ~  * Licensed to the Apache Software Foundation (ASF) under one
+  ~  * or more contributor license agreements.  See the NOTICE file
+  ~  * distributed with this work for additional information
+  ~  * regarding copyright ownership.  The ASF licenses this file
+  ~  * to you under the Apache License, Version 2.0 (the
+  ~  * "License"); you may not use this file except in compliance
+  ~  * with the License.  You may obtain a copy of the License at
+  ~  *
+  ~  *   http://www.apache.org/licenses/LICENSE-2.0
+  ~  *
+  ~  * Unless required by applicable law or agreed to in writing,
+  ~  * software distributed under the License is distributed on an
+  ~  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  * KIND, either express or implied.  See the License for the
+  ~  * specific language governing permissions and limitations
+  ~  * under the License.
+  ~  */
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>project</artifactId>
+    <groupId>org.apache.maven.plugin.assembly.test</groupId>
+    <version>1</version>
+  </parent>
+  <artifactId>child-3</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.plugin.assembly.test</groupId>
+      <artifactId>child-1</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin.assembly.test</groupId>
+      <artifactId>child-2</artifactId>
+      <version>1</version>
+    </dependency>
+  </dependencies>
+</project>

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/bin.xml
 (from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/bin.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/bin.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml&r1=1691728&r2=1691766&rev=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/bin.xml
 Sat Jul 18 18:59:37 2015
@@ -28,6 +28,7 @@ under the License.
   <includeBaseDirectory>false</includeBaseDirectory>
   <moduleSets>
     <moduleSet>
+      <useAllReactorProjects>true</useAllReactorProjects>
       <binaries>
         <outputDirectory>${module.artifactId}</outputDirectory>
         <includeDependencies>true</includeDependencies>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean package assembly:assembly
+invoker.goals=clean install

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -29,23 +29,11 @@ under the License.
   
   <artifactId>project</artifactId>
   <packaging>pom</packaging>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <inherited>false</inherited>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
+
   <modules>
     <module>child-1</module>
     <module>child-2</module>
+    <module>child-3</module>
+
   </modules>
 </project>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
 Sat Jul 18 18:59:37 2015
@@ -19,8 +19,8 @@
 
 import java.io.*;
 
-File child1Codec = new File( basedir, 
"target/project-1-bin/child-1/commons-codec-1.3.jar" );
-File child2Codec = new File( basedir, 
"target/project-1-bin/child-2/commons-codec-1.3.jar" );
+File child1Codec = new File( basedir, 
"child-3/target/child-3-1-bin/child-1/commons-codec-1.3.jar" );
+File child2Codec = new File( basedir, 
"child-3/target/child-3-1-bin/child-2/commons-codec-1.3.jar" );
 
 if ( !child1Codec.exists() )
 {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-739/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-739/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-739/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-739/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -47,7 +47,7 @@ under the License.
                         <id>generate-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                         <configuration>
                             <descriptors>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -59,7 +59,7 @@ under the License.
               <id>make-assembly</id>
               <phase>package</phase>
               <goals>
-                <goal>attached</goal>
+                <goal>single</goal>
               </goals>
             </execution>
           </executions>

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/pom.xml?rev=1691766&view=auto
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ /*
+  ~  * Licensed to the Apache Software Foundation (ASF) under one
+  ~  * or more contributor license agreements.  See the NOTICE file
+  ~  * distributed with this work for additional information
+  ~  * regarding copyright ownership.  The ASF licenses this file
+  ~  * to you under the Apache License, Version 2.0 (the
+  ~  * "License"); you may not use this file except in compliance
+  ~  * with the License.  You may obtain a copy of the License at
+  ~  *
+  ~  *   http://www.apache.org/licenses/LICENSE-2.0
+  ~  *
+  ~  * Unless required by applicable law or agreed to in writing,
+  ~  * software distributed under the License is distributed on an
+  ~  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  * KIND, either express or implied.  See the License for the
+  ~  * specific language governing permissions and limitations
+  ~  * under the License.
+  ~  */
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>test</groupId>
+    <artifactId>massembly-99</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>assembly</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>test</groupId>
+      <artifactId>module-a</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>test</groupId>
+      <artifactId>module-b</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/bin.xml
 (from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/bin.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/bin.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml&r1=1691728&r2=1691766&rev=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/bin.xml
 Sat Jul 18 18:59:37 2015
@@ -1,36 +1,39 @@
 <?xml version='1.0'?>
 <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
+  ~ /*
+  ~  * Licensed to the Apache Software Foundation (ASF) under one
+  ~  * or more contributor license agreements.  See the NOTICE file
+  ~  * distributed with this work for additional information
+  ~  * regarding copyright ownership.  The ASF licenses this file
+  ~  * to you under the Apache License, Version 2.0 (the
+  ~  * "License"); you may not use this file except in compliance
+  ~  * with the License.  You may obtain a copy of the License at
+  ~  *
+  ~  *   http://www.apache.org/licenses/LICENSE-2.0
+  ~  *
+  ~  * Unless required by applicable law or agreed to in writing,
+  ~  * software distributed under the License is distributed on an
+  ~  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  * KIND, either express or implied.  See the License for the
+  ~  * specific language governing permissions and limitations
+  ~  * under the License.
+  ~  */
+  -->
 
 <assembly 
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
   <id>bin</id>
-  
+
   <formats>
     <format>dir</format>
   </formats>
-  
+
   <includeBaseDirectory>false</includeBaseDirectory>
-  
+
   <moduleSets>
     <moduleSet>
+      <useAllReactorProjects>true</useAllReactorProjects>
       <binaries>
         <outputDirectory>modules</outputDirectory>
         
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
@@ -47,5 +50,5 @@ under the License.
       </binaries>
     </moduleSet>
   </moduleSets>
- 
+
 </assembly>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean package 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean package

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -1,23 +1,24 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
 
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+  <!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
 
   <parent>
     <groupId>test</groupId>
@@ -25,7 +26,7 @@ under the License.
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-    <artifactId>module-a</artifactId>
+  <artifactId>module-a</artifactId>
   <name>Assembly Spike Module A</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -25,7 +25,7 @@ under the License.
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-    <artifactId>module-b</artifactId>
+  <artifactId>module-b</artifactId>
   <name>Assembly Spike Module B</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
@@ -41,4 +41,17 @@ under the License.
       <version>1.4</version>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>../src/main/assemblies/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -19,14 +19,15 @@ specific language governing permissions
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.plugin.assembly.test</groupId>
     <artifactId>it-project-parent</artifactId>
     <version>1</version>
   </parent>
-  
+
   <groupId>test</groupId>
   <artifactId>massembly-99</artifactId>
   <packaging>pom</packaging>
@@ -35,36 +36,16 @@ under the License.
   <modules>
     <module>module-a</module>
     <module>module-b</module>
+    <module>assembly</module>
   </modules>
   <dependencies>
-    <dependency>
+
+  <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assemblies/bin.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>  
   <pluginRepositories>
     <pluginRepository>
       <id>apache.snapshots</id>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh
 Sat Jul 18 18:59:37 2015
@@ -21,11 +21,11 @@ import java.io.*;
 
 boolean result = true;
 
-result = result && new File( basedir, 
"target/massembly-99-1.0-SNAPSHOT-bin/lib/jdom.jar" ).exists();
-result = result && new File( basedir, 
"target/massembly-99-1.0-SNAPSHOT-bin/lib/velocity.jar" ).exists();
+result = result && new File( basedir, 
"assembly/target/assembly-1.0-SNAPSHOT-bin/lib/jdom.jar" ).exists();
+result = result && new File( basedir, 
"assembly/target/assembly-1.0-SNAPSHOT-bin/lib/velocity.jar" ).exists();
 
-result = result && new File( basedir, 
"target/massembly-99-1.0-SNAPSHOT-bin/modules/module-a.jar" ).exists();
-result = result && new File( basedir, 
"target/massembly-99-1.0-SNAPSHOT-bin/modules/module-b.jar" ).exists();
+result = result && new File( basedir, 
"assembly/target/assembly-1.0-SNAPSHOT-bin/modules/module-a.jar" ).exists();
+result = result && new File( basedir, 
"assembly/target/assembly-1.0-SNAPSHOT-bin/modules/module-b.jar" ).exists();
 
 
 return result;

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean package 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean package

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -41,4 +41,17 @@ under the License.
       <version>1.0</version>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>../src/main/assemblies/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+
+  </build>
 </project>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -41,4 +41,28 @@ under the License.
       <version>1.4</version>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assemblies/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+
+  </build>
+
 </project>

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/bin.xml
 (from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/bin.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/bin.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml&r1=1691728&r2=1691766&rev=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/bin.xml
 Sat Jul 18 18:59:37 2015
@@ -31,6 +31,7 @@ under the License.
   
   <moduleSets>
     <moduleSet>
+      <useAllReactorProjects>true</useAllReactorProjects>
       <binaries>
         <outputDirectory>modules</outputDirectory>
         
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -42,28 +42,6 @@ under the License.
       <version>1.0.4</version>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assemblies/bin.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>  
   <pluginRepositories>
     <pluginRepository>
       <id>apache.snapshots</id>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
 Sat Jul 18 18:59:37 2015
@@ -21,11 +21,11 @@ import java.io.*;
 
 boolean result = true;
 
-result = result && new File( basedir, 
"target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/jdom-1.0.jar" 
).exists();
-result = result && new File( basedir, 
"target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/velocity-1.4.jar"
 ).exists();
+result = result && new File( basedir, 
"module-b/target/module-b-1.0-SNAPSHOT-bin/modules/jdom-1.0.jar" ).exists();
+result = result && new File( basedir, 
"module-b/target/module-b-1.0-SNAPSHOT-bin/modules/velocity-1.4.jar" ).exists();
 
-result = result && new File( basedir, 
"target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/module-a.jar" 
).exists();
-result = result && new File( basedir, 
"target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/module-b.jar" 
).exists();
+result = result && new File( basedir, 
"module-b/target/module-b-1.0-SNAPSHOT-bin/modules/module-a.jar" ).exists();
+result = result && new File( basedir, 
"module-b/target/module-b-1.0-SNAPSHOT-bin/modules/module-b.jar" ).exists();
 
 
 return result;

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
 invoker.os.family = !windows
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml
 Sat Jul 18 18:59:37 2015
@@ -24,6 +24,7 @@ under the License.
   <id>src</id>
   <formats>
     <format>tar.gz</format>
+    <format>dir</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml
 Sat Jul 18 18:59:37 2015
@@ -24,6 +24,7 @@ under the License.
   <id>src</id>
   <formats>
     <format>tar.gz</format>
+    <format>dir</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
   <files>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -51,7 +51,7 @@ under the License.
             <id>build-parent-assembly</id>
             <phase>package</phase>
             <goals>
-              <goal>directory-single</goal>
+              <goal>single</goal>
             </goals>
           </execution>
         </executions>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -38,4 +38,17 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>../src/assemble/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -38,4 +38,26 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>../src/assemble/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
 Sat Jul 18 18:59:37 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=install 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
+invoker.goals=install

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -39,16 +39,4 @@ under the License.
     <module>child2</module>
   </modules>
   
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/assemble/bin.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
 Sat Jul 18 18:59:37 2015
@@ -28,6 +28,7 @@ under the License.
   <includeBaseDirectory>true</includeBaseDirectory>
   <moduleSets>
     <moduleSet>
+      <useAllReactorProjects>true</useAllReactorProjects>
       <binaries>
         <outputDirectory>modules</outputDirectory>
         
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
 Sat Jul 18 18:59:37 2015
@@ -25,7 +25,7 @@ boolean result = true;
 
 try
 {
-    File zipFile = new File( basedir, 
"target/assembly-assembly-with-module-binaries-1.0-bin.zip" );
+    File zipFile = new File( basedir, 
"child2/target/child2-1.0-SNAPSHOT-bin.zip" );
     
     if ( !zipFile.exists() || zipFile.isDirectory() )
     {
@@ -35,13 +35,13 @@ try
     
     ZipFile zf = new ZipFile( zipFile );
     
-    if ( zf.getEntry( 
"assembly-assembly-with-module-binaries-1.0/modules/child1.jar" ) == null )
+    if ( zf.getEntry( "child2-1.0-SNAPSHOT/modules/child1.jar" ) == null )
     {
         System.err.println( "child1 entry is missing." );
         result = false;
     }
     
-    if ( zf.getEntry( 
"assembly-assembly-with-module-binaries-1.0/modules/child2.jar" ) == null )
+    if ( zf.getEntry( "child2-1.0-SNAPSHOT/modules/child2.jar" ) == null )
     {
         System.err.println( "child2 entry is missing." );
         result = false;

Reply via email to