maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r568360 [1/3] - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/ src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/ src/it/basic-features/ src/it/...
Date Wed, 22 Aug 2007 01:28:35 GMT
Author: jdcasey
Date: Tue Aug 21 18:28:22 2007
New Revision: 568360

URL: http://svn.apache.org/viewvc?rev=568360&view=rev
Log:
[MASSEMBLY-222] Sorry for the huge commit. This rearranges the integration tests to pull from local repo to the testing local repo where possible, and copies the test projects to target/test-classes before running, to avoid pollution of the sources. It also changes the interpolation of outputDirectory and outputFileNameMapping, such that pom.artifactId refers to the main project being built, while artifact.artifactId refers to the dependency currently being processed (and module.artifactId is a synonym for artifact.artifactId when processing modules. Also adjusted the unit tests to be less fragile in the face of minor changes in the call structure to things like Artifact instances, to reduce the rippling failures from minor debug statements.

Added:
    maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/
    maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml   (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/assemblyDescriptor-artifact/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/file-copyIntoTopDir/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/file-sameName/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-simple/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/container-descriptors/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/container-descriptors/custom-containerDescriptorHandler/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/container-descriptors/custom-handler-withFileEntries/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/container-descriptors/custom-handler-withMixedEntries/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-matchScope/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-notUnpacked/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-projectArtifactNotIncluded/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpacked/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-withExecutedProject/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/include-project-artifact/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/include-project-attachments/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/include-provided/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/including-pom-dependency/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/including-sar-dependency/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/massembly-99/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/using-moduleSet-implied-depSet/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/bin/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/project/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/src/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/file-modes/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-modes/file-set-fileMode/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-modes/fileItem-fileMode/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/excluding-svn-dirs/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/include-base-directory/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/include-parent-dir/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/manifest-with-customEntry/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/manifest-with-mainClass/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/module-sourceIncludedBinaryNotIncluded/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/module-sourceNotIncludedBinaryIncluded/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/two-level-multimodule/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/two-level-multimodule-dontIncludeSubModules/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/two-levels-includeBaseDirectory-withBinaries/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/two-levels-includeBaseDirectory-withSources/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/
      - copied from r566355, maven/plugins/trunk/maven-assembly-plugin/src/it/repositories/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/repositories/basic-repository/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/
      - copied from r568359, maven/plugins/trunk/maven-assembly-plugin/src/it/repositories/repo-with-snapshot-parents/
    maven/plugins/trunk/maven-assembly-plugin/src/it/remote-repository/
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java   (with props)
Removed:
    maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/
    maven/plugins/trunk/maven-assembly-plugin/src/it/container-descriptors/
    maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/
    maven/plugins/trunk/maven-assembly-plugin/src/it/file-modes/
    maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/
    maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/
    maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/
    maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/
    maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/
    maven/plugins/trunk/maven-assembly-plugin/src/it/multimodule/
    maven/plugins/trunk/maven-assembly-plugin/src/it/repositories/
Modified:
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
    maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.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/src/main/assemblies/bin.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/src/main/assemblies/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml
    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-attached-with-module-binaries/pom.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/mojo-configuration/manifest-with-customEntry/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/src/assemble/src.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/src/assemble/bin.xml
    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/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/src/assemble/src.xml
    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-includeSubModules-excludeSubModuleSourceDirs/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
    maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
    maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt
    maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Aug 21 18:28:22 2007
@@ -214,7 +214,27 @@
         </pluginRepository>
       </pluginRepositories>
       
+      <properties>
+        <test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
+      </properties>
+  
       <build>
+        <testResources>
+          <testResource>
+            <directory>src/it/projects</directory>
+            <targetPath>projects</targetPath>
+          </testResource>
+          <testResource>
+            <directory>src/it/it-project-parent</directory>
+            <targetPath>it-project-parent</targetPath>
+            <filtering>true</filtering>
+          </testResource>
+          <testResource>
+            <directory>src/it/remote-repository</directory>
+            <targetPath>remote-repository</targetPath>
+          </testResource>
+        </testResources>
+
         <plugins>
           <plugin>
             <artifactId>maven-clean-plugin</artifactId>
@@ -234,8 +254,25 @@
           <plugin>
             <artifactId>maven-component-it-plugin</artifactId>
             <version>1.0-SNAPSHOT</version>
+            
+            <configuration>
+              <pluginVersion>testing</pluginVersion>
+              <repositoryDirectory>${project.build.directory}/local-repository</repositoryDirectory>
+              <skipUnitTests>true</skipUnitTests>
+            </configuration>
+            
             <executions>
               <execution>
+                <id>inject-localrepo-path</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>inject-local-repository-path</goal>
+                </goals>
+                <configuration>
+                  <property>local.repo.path</property>
+                </configuration>
+              </execution>
+              <execution>
                 <id>stage-artifact-types</id>
                 <phase>pre-integration-test</phase>
                 <goals>
@@ -259,23 +296,41 @@
             <version>1.1-SNAPSHOT</version>
             <executions>
               <execution>
+                <id>setup-integration-test-parent</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <suppressSummaries>true</suppressSummaries>
+                  <goals>
+                    <goal>install</goal>
+                  </goals>
+                  <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
+                  <pom>${project.build.testOutputDirectory}/it-project-parent/pom.xml</pom>
+                  <streamLogs>true</streamLogs>
+                </configuration>
+              </execution>
+              <execution>
                 <id>integration-test</id>
                 <phase>integration-test</phase>
                 <goals>
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <projectsDirectory>src/it</projectsDirectory>
+                  <projectsDirectory>${project.build.testOutputDirectory}/projects</projectsDirectory>
                   
                   <!-- Useful config for debugging one IT -->
                   <!-- 
                   <debug>true</debug>
                   <pomIncludes>
-                    <pomInclude>container-descriptors/custom-handler-withFileEntries/pom.xml</pomInclude>
+                    <pomInclude>multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml</pomInclude>
+                    <pomInclude>multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml</pomInclude>
                   </pomIncludes>
                   <streamLogs>true</streamLogs>
                    -->
                   <!-- END single-IT debugging block. -->
+                  
                   <pomIncludes>
                     <pomInclude>**/pom.xml</pomInclude>
                   </pomIncludes>
@@ -289,7 +344,7 @@
                     <pomExclude>**/assembly/pom.xml</pomExclude>
                   </pomExcludes>
                   <postBuildHookScript>verify.bsh</postBuildHookScript>
-                  <localRepositoryPath>${basedir}/target/local-repository</localRepositoryPath>
+                  <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
                 </configuration>
               </execution>
            </executions>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java Tue Aug 21 18:28:22 2007
@@ -27,7 +27,7 @@
         Assembly assembly = new Assembly();
 
         DependencySet set = new DependencySet();
-        set.setOutputFileNameMapping( "${artifactId}.${extension}" );
+        set.setOutputFileNameMapping( "${artifact.artifactId}.${artifact.extension}" );
 
         assembly.addDependencySet( set );
 

Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml Tue Aug 21 18:28:22 2007
@@ -11,7 +11,7 @@
         <include>org.test.2:test2</include>
       </includes>
       <outputDirectory>/dependencies/</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
     </dependencySet>
   </dependencySets>
 </assembly>

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml?rev=568360&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml Tue Aug 21 18:28:22 2007
@@ -0,0 +1,46 @@
+<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>
+  <groupId>org.apache.maven.plugin.assembly.test</groupId>
+  <artifactId>it-project-parent</artifactId>
+  <packaging>pom</packaging>
+  <version>1</version>
+  
+  <repositories>
+    <repository>
+      <id>main.local.as.remote</id>
+      <url>file://${local.repo.path}</url>
+    </repository>
+    <repository>
+      <id>integration.test.repo</id>
+      <url>${test.remote.repo.url}</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>main.local.as.remote</id>
+      <url>file://${local.repo.path}</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>integration.test.repo</id>
+      <url>${test.remote.repo.url}</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <distributionManagement>
+    <repository>
+      <id>integration.test.repo</id>
+      <url>${test.remote.repo.url}</url>
+    </repository>
+  </distributionManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>testing</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>org.test</groupId>
   <artifactId>assemblyDescriptor-artifact</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>org.test</groupId>
   <artifactId>parent</artifactId>
   <version>1.0</version>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>org.test</groupId>
   <artifactId>parent</artifactId>
   <version>1.0</version>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>org.test</groupId>
   <artifactId>parent</artifactId>
   <version>1.0</version>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -10,7 +10,7 @@
       <includes>
         <include>commons-logging:commons-logging</include>
       </includes>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
     </dependencySet>
   </dependencySets>
 </assembly>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>outputFileNameMapping-withArtifactBaseVersion</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
     <dependencySet>
       <unpack>false</unpack>
       <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}-${baseVersion}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
     </dependencySet>
   </dependencySets>
 </assembly>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>org.test</groupId>
   <artifactId>custom-containerDescriptorHandler</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>org.test</groupId>
   <artifactId>custom-handler-withFileEntries</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>org.test</groupId>
   <artifactId>custom-handler-withMixedEntries</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
     <dependencySet>
       <unpack>false</unpack>
       <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>dependencySet-matchScope</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -11,7 +11,7 @@
       </includes>
       <unpack>false</unpack>
       <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
       <scope>test</scope>
       <excludes>
         <exclude>junit:junit</exclude>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>dependencySet-notUnpacked</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <project>
   <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>dependencySet-projectArtifactNotIncluded</artifactId>
   <version>1.0-SNAPSHOT</version>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -10,7 +10,7 @@
         <include>test:child1</include>
       </includes>
       <unpack>true</unpack>
-      <outputDirectory>/${artifactId}</outputDirectory>
+      <outputDirectory>/${artifact.artifactId}</outputDirectory>
       <scope>test</scope>
       <excludes>
         <exclude>junit:junit</exclude>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>dependencySet-unpacked</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -15,7 +15,7 @@
           <exclude>META-INF/**</exclude>
         </excludes>
       </unpackOptions>
-      <outputDirectory>/${artifactId}</outputDirectory>
+      <outputDirectory>/${artifact.artifactId}</outputDirectory>
       <scope>test</scope>
       <excludes>
         <exclude>junit:junit</exclude>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>dependencySet-unpackedExcludingMetaInf</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
     <dependencySet>
       <unpack>false</unpack>
       <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,5 +1,11 @@
 <?xml version="1.0"?><project>
   <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>dependencySet-withExecutedProject</artifactId>
   <version>1.0-SNAPSHOT</version>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
     <dependencySet>
       <unpack>false</unpack>
       <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>include-project-artifact</artifactId>
   <version>1.0-SNAPSHOT</version>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>include-project-attachments</artifactId>
   <version>1.0-SNAPSHOT</version>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
     <dependencySet>
       <unpack>false</unpack>
       <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
       <scope>provided</scope>
     </dependencySet>
   </dependencySets>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>include-provided</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>including-pom-dependency</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -6,7 +6,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>lib/${artifactId}</outputDirectory>
+      <outputDirectory>lib/${artifact.artifactId}</outputDirectory>
       <unpack>true</unpack>
       <excludes>
         <exclude>*:pom</exclude>
@@ -14,7 +14,7 @@
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
       <unpack>true</unpack>
       <includes>
         <include>*:pom</include>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>including-sar-dependency</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -6,7 +6,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>lib/${artifactId}</outputDirectory>
+      <outputDirectory>lib/${artifact.artifactId}</outputDirectory>
       <unpack>true</unpack>
     </dependencySet>
   </dependencySets>

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=568360&r1=568359&r2=568360&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 Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>

Modified: 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/src/main/assemblies/bin.xml?rev=568360&r1=568359&r2=568360&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/src/main/assemblies/bin.xml Tue Aug 21 18:28:22 2007
@@ -11,13 +11,13 @@
     <moduleSet>
       <binaries>
         <outputDirectory>modules</outputDirectory>
-        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+        <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
         <unpack>false</unpack>
 
         <dependencySets>
           <dependencySet>
             <outputDirectory>lib</outputDirectory>
-            <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <scope>runtime</scope>
           </dependencySet>

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=568360&r1=568359&r2=568360&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 Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>using-moduleSet-implied-depSet</artifactId>
   <packaging>pom</packaging>

Modified: 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/src/main/assemblies/bin.xml?rev=568360&r1=568359&r2=568360&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/src/main/assemblies/bin.xml Tue Aug 21 18:28:22 2007
@@ -11,7 +11,7 @@
     <moduleSet>
       <binaries>
         <outputDirectory>modules</outputDirectory>
-        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+        <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
         <unpack>false</unpack>
         <includeDependencies>true</includeDependencies>
       </binaries>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -10,8 +10,7 @@
         <include>test:child1</include>
       </includes>
       <unpack>true</unpack>
-      <outputDirectory>/</outputDirectory>
-      <outputFileNameMapping>${artifactId}</outputFileNameMapping>
+      <outputDirectory>${artifact.artifactId}</outputDirectory>
       <scope>test</scope>
       <excludes>
         <exclude>junit:junit</exclude>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -10,8 +10,7 @@
         <include>test:child1</include>
       </includes>
       <unpack>true</unpack>
-      <outputDirectory>/</outputDirectory>
-      <outputFileNameMapping>${artifactId}</outputFileNameMapping>
+      <outputDirectory>${artifact.artifactId}</outputDirectory>
       <scope>test</scope>
       <excludes>
         <exclude>junit:junit</exclude>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>file-set-fileMode</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>fileItem-fileMode</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>default-excludes-unspecified</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>dont-use-default-excludes</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>excluding-svn-dirs</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>include-base-directory</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>include-parent-dir</artifactId>
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
 <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>use-default-excludes</artifactId>
   <packaging>jar</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml Tue Aug 21 18:28:22 2007
@@ -3,6 +3,12 @@
 	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>org.test</groupId>
 	<artifactId>parent</artifactId>
 	<version>1.0</version>



Mime
View raw message