Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml Mon Aug 18 15:48:59 2008 @@ -16,7 +16,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml Mon Aug 18 15:48:59 2008 @@ -16,7 +16,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml Mon Aug 18 15:48:59 2008 @@ -22,7 +22,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml Mon Aug 18 15:48:59 2008 @@ -24,7 +24,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <inherited>false</inherited> <configuration> <descriptors> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/goals.txt?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/goals.txt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/goals.txt Mon Aug 18 15:48:59 2008 @@ -1 +1 @@ -clean package org.apache.maven.plugins:maven-assembly-plugin:testing:directory-inline +clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml Mon Aug 18 15:48:59 2008 @@ -24,7 +24,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <inherited>false</inherited> <configuration> <descriptors> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/goals.txt?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/goals.txt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/goals.txt Mon Aug 18 15:48:59 2008 @@ -1 +1 @@ -package org.apache.maven.plugins:maven-assembly-plugin:testing:directory +package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml Mon Aug 18 15:48:59 2008 @@ -21,7 +21,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/goals.txt?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/goals.txt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/goals.txt Mon Aug 18 15:48:59 2008 @@ -1 +1 @@ -package org.apache.maven.plugins:maven-assembly-plugin:testing:directory +package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml Mon Aug 18 15:48:59 2008 @@ -21,7 +21,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/goals.txt?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/goals.txt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/goals.txt Mon Aug 18 15:48:59 2008 @@ -1 +1 @@ -clean package org.apache.maven.plugins:maven-assembly-plugin:testing:directory-inline +clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml Mon Aug 18 15:48:59 2008 @@ -21,7 +21,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/goals.txt?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/goals.txt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/goals.txt Mon Aug 18 15:48:59 2008 @@ -1 +1 @@ -clean org.apache.maven.plugins:maven-assembly-plugin:testing:directory-inline +clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml Mon Aug 18 15:48:59 2008 @@ -21,7 +21,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/assemble/src.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/goals.txt?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/goals.txt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/goals.txt Mon Aug 18 15:48:59 2008 @@ -1,2 +1,2 @@ clean -org.apache.maven.plugins:maven-assembly-plugin:testing:directory-inline +org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml Mon Aug 18 15:48:59 2008 @@ -21,7 +21,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/goals.txt?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/goals.txt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/goals.txt Mon Aug 18 15:48:59 2008 @@ -1,2 +1,2 @@ clean -org.apache.maven.plugins:maven-assembly-plugin:testing:directory-inline +org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml Mon Aug 18 15:48:59 2008 @@ -21,7 +21,7 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId><version>testing</version> + <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml Mon Aug 18 15:48:59 2008 @@ -25,7 +25,6 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>testing</version> <configuration> <descriptor>src/assemble/bin.xml</descriptor> <finalName>assembly</finalName> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml Mon Aug 18 15:48:59 2008 @@ -20,7 +20,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.4.3</version> </dependency> <dependency> <groupId>junit</groupId> @@ -33,7 +33,6 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>testing</version> <configuration> <descriptor>src/assemble/bin.xml</descriptor> <finalName>assembly</finalName> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml?rev=686889&r1=686888&r2=686889&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml Mon Aug 18 15:48:59 2008 @@ -40,5 +40,71 @@ <implementation>org.apache.maven.plugin.assembly.filter.ComponentsXmlArchiverFileFilter</implementation> <instantiation-strategy>per-lookup</instantiation-strategy> </component> + + <component> + <role>org.apache.maven.artifact.handler.ArtifactHandler</role> + <role-hint>assembly-component</role-hint> + <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation> + <configuration> + <packaging>assembly-component</packaging> + <classifier>assembly-component</classifier> + <extension>xml</extension> + <type>xml</type> + <addedToClasspath>false</addedToClasspath> + <includesDependencies>true</includesDependencies> + </configuration> + </component> + <component> + <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role> + <role-hint>assembly-component</role-hint> + <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation> + <configuration> + <lifecycles> + <lifecycle> + <id>default</id> + <!-- START SNIPPET: assembly-component-lifecycle --> + <phases> + <package>org.apache.maven.plugins:maven-assembly-plugin:attach-component-descriptor</package> + <install>org.apache.maven.plugins:maven-install-plugin:install</install> + <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy> + </phases> + <!-- END SNIPPET: assembly-component-lifecycle --> + </lifecycle> + </lifecycles> + </configuration> + </component> + + <component> + <role>org.apache.maven.artifact.handler.ArtifactHandler</role> + <role-hint>assembly-descriptor</role-hint> + <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation> + <configuration> + <packaging>assembly-descriptor</packaging> + <classifier>assembly-descriptor</classifier> + <extension>xml</extension> + <type>xml</type> + <addedToClasspath>false</addedToClasspath> + <includesDependencies>true</includesDependencies> + </configuration> + </component> + <component> + <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role> + <role-hint>assembly-descriptor</role-hint> + <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation> + <configuration> + <lifecycles> + <lifecycle> + <id>default</id> + <!-- START SNIPPET: assembly-descriptor-lifecycle --> + <phases> + <package>org.apache.maven.plugins:maven-assembly-plugin:attach-assembly-descriptor</package> + <install>org.apache.maven.plugins:maven-install-plugin:install</install> + <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy> + </phases> + <!-- END SNIPPET: assembly-descriptor-lifecycle --> + </lifecycle> + </lifecycles> + </configuration> + </component> </components> </component-set>
