You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/08/19 00:49:02 UTC
svn commit: r686889 [1/2] - in /maven/plugins/trunk/maven-assembly-plugin:
./ maven-assembly-artifact-types/ src/it/it-project-parent/
src/it/projects/basic-features/assemblyDescriptor-artifact/
src/it/projects/basic-features/assemblyDescriptor-artifac...
Author: jdcasey
Date: Mon Aug 18 15:48:59 2008
New Revision: 686889
URL: http://svn.apache.org/viewvc?rev=686889&view=rev
Log:
Removing the sub-project for the handlers and lifecycle mappings, as this isn't needed for now (it was never released). Also, cleaning up the integration tests to work without the component-it-plugin, which has never graduated the sandbox and may not be the best way to setup plugin testing environments.
Removed:
maven/plugins/trunk/maven-assembly-plugin/maven-assembly-artifact-types/
maven/plugins/trunk/maven-assembly-plugin/src/main/aspect/
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/descriptor/pom.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/descriptorDirectoryScan/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/goals.txt
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/goals.txt
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/massembly-256-pomPropertiesInterp/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/goals.txt
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-withArtifactBaseVersion/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.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/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/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/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/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/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/goals.txt
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/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/pom.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/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/goals.txt
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-sar-dependency/goals.txt
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/massembly-99/goals.txt
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/using-moduleSet-implied-depSet/goals.txt
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/descriptor-refs/bin/jars-in-archive-root/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/goals.txt
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/goals.txt
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/goals.txt
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/goals.txt
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/goals.txt
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/goals.txt
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/child/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/goals.txt
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/goals.txt
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/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/goals.txt
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-twice-in-multimodule-hierarchy/child1/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/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/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/goals.txt
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/goals.txt
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/goals.txt
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/goals.txt
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/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/goals.txt
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/goals.txt
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/child/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon Aug 18 15:48:59 2008
@@ -215,9 +215,11 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
<executions>
<execution>
<id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>
@@ -227,14 +229,8 @@
<configuration>
<output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
<descriptors>
- <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
<descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor>
-
- <!-- This is a separate artifact also, but we need access to
- the ArtifactHandlers from the assembly plugin to enable
- attachment of these artifacts without requiring weird
- configurations. -->
- <descriptor>maven-assembly-artifact-types/src/main/resources/META-INF/plexus/components.xml</descriptor>
</descriptors>
</configuration>
<phase>generate-resources</phase>
@@ -332,87 +328,31 @@
<test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
<it.pomIncludes>**/pom.xml</it.pomIncludes>
<it.streamLogs>false</it.streamLogs>
+ <testVersion>${pom.version}</testVersion>
+ <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
+ <invokerPluginVersion>1.2.1</invokerPluginVersion>
</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>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/it</directory>
- <includes>
- <include>**/target</include>
- <include>**/build.log</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-component-it-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
-
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>${invokerPluginVersion}</version>
+
<configuration>
- <pluginVersion>testing</pluginVersion>
- <repositoryDirectory>${project.build.directory}/local-repository</repositoryDirectory>
- <skipUnitTests>true</skipUnitTests>
+ <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
+ <properties>
+ <testVersion>${testVersion}</testVersion>
+ <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
+ <invokerPluginVersion>${invokerPluginVersion}</invokerPluginVersion>
+ </properties>
</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>
- <goal>stage</goal>
- </goals>
- <configuration>
- <pomFile>maven-assembly-artifact-types/pom.xml</pomFile>
- </configuration>
- </execution>
- <execution>
- <id>stage-plugin</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>stage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
- <id>setup-integration-test-parent</id>
+ <id>setup-integration-test-env</id>
<phase>pre-integration-test</phase>
<goals>
+ <goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
@@ -420,8 +360,11 @@
<goals>
<goal>install</goal>
</goals>
- <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
- <pom>${project.build.testOutputDirectory}/it-project-parent/pom.xml</pom>
+ <projectsDirectory>src/it/it-project-parent</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it/it-project-parent</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>pom.xml</pomInclude>
+ </pomIncludes>
<streamLogs>true</streamLogs>
</configuration>
</execution>
@@ -432,7 +375,8 @@
<goal>run</goal>
</goals>
<configuration>
- <projectsDirectory>${project.build.testOutputDirectory}/projects</projectsDirectory>
+ <projectsDirectory>src/it/projects</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo>
<testPropertiesFile>test.properties</testPropertiesFile>
<debug>true</debug>
@@ -442,20 +386,17 @@
<streamLogs>${it.streamLogs}</streamLogs>
<pomExcludes>
<pomExclude>repositories/repo-with-snapshot-parents/pom.xml</pomExclude>
-
+
+ <!-- This will be handled by the parent in the bugs/massembly-285 dir. -->
+ <pomExclude>bugs/massembly-285/massembly-285-assembly/pom.xml</pomExclude>
+
<pomExclude>**/child*/pom.xml</pomExclude>
<pomExclude>**/module*/pom.xml</pomExclude>
<pomExclude>**/descriptor/pom.xml</pomExclude>
<pomExclude>**/handler-def/pom.xml</pomExclude>
<pomExclude>**/assembly/pom.xml</pomExclude>
-
- <!-- MASSEMBLY-233 -->
-<!--
- <pomExclude>**/container-descriptors/**</pomExclude>
- -->
</pomExcludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
</configuration>
</execution>
</executions>
@@ -463,26 +404,5 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>aspects</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- <execution>
- <id>weave</id>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: 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=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml Mon Aug 18 15:48:59 2008
@@ -14,31 +14,35 @@
</activation>
<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>
+ <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>
+ <url>@test.remote.repo.url@</url>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
<repository>
<id>integration.test.repo</id>
- <url>${test.remote.repo.url}</url>
+ <url>@test.remote.repo.url@</url>
</repository>
</distributionManagement>
@@ -46,7 +50,8 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
+ <version>${testVersion}</version>
+ <extensions>true</extensions>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/assembly/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/assembly/pom.xml Mon Aug 18 15:48:59 2008
@@ -17,7 +17,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<configuration>
<descriptors>
<descriptor>org.test:descriptor:1</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/descriptor/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/descriptor/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/descriptor/pom.xml Mon Aug 18 15:48:59 2008
@@ -13,7 +13,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
</plugin>
</plugins>
</build>
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -17,14 +17,4 @@
<module>descriptor</module>
<module>assembly</module>
</modules>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-artifact-types</artifactId>
- <version>testing</version>
- </extension>
- </extensions>
- </build>
</project>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-clean org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml Mon Aug 18 15:48:59 2008
@@ -25,7 +25,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorSourceDirectory>src/assemble</descriptorSourceDirectory>
</configuration>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<configuration>
<descriptors>
<descriptor>src/assemble/bin.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-org.apache.maven.plugins:maven-assembly-plugin:testing:assembly
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -22,7 +22,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<configuration>
<descriptors>
<descriptor>src/assemble/bin.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/goals.txt Mon Aug 18 15:48:59 2008
@@ -1,2 +1,2 @@
clean
-org.apache.maven.plugins:maven-assembly-plugin:testing:attached
\ No newline at end of file
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-clean org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -25,7 +25,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <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/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -33,7 +33,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/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml Mon Aug 18 15:48:59 2008
@@ -10,7 +10,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml Mon Aug 18 15:48:59 2008
@@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
+ <version>${testVersion}</version>
<scope>provided</scope>
</dependency>
</dependencies>
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -16,29 +16,15 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-component-it-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <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>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.0</version>
+ <version>${invokerPluginVersion}</version>
<configuration>
<suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${local.repo.path}</localRepositoryPath>
+ <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
+ <properties>
+ <testVersion>${testVersion}</testVersion>
+ </properties>
<streamLogs>true</streamLogs>
<goals>
<goal>install</goal>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml Mon Aug 18 15:48:59 2008
@@ -10,7 +10,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml Mon Aug 18 15:48:59 2008
@@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
+ <version>${testVersion}</version>
<scope>provided</scope>
</dependency>
</dependencies>
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -16,30 +16,16 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-component-it-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <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>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.0</version>
+ <version>${invokerPluginVersion}</version>
<configuration>
<suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${local.repo.path}</localRepositoryPath>
+ <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
<streamLogs>true</streamLogs>
+ <properties>
+ <testVersion>${testVersion}</testVersion>
+ </properties>
<goals>
<goal>install</goal>
</goals>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml Mon Aug 18 15:48:59 2008
@@ -10,7 +10,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml Mon Aug 18 15:48:59 2008
@@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
+ <version>${testVersion}</version>
<scope>provided</scope>
</dependency>
</dependencies>
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -16,29 +16,15 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-component-it-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <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>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.0</version>
+ <version>${invokerPluginVersion}</version>
<configuration>
<suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${local.repo.path}</localRepositoryPath>
+ <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
+ <properties>
+ <testVersion>${testVersion}</testVersion>
+ </properties>
<streamLogs>true</streamLogs>
<goals>
<goal>install</goal>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -28,7 +28,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -28,7 +28,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -29,7 +29,7 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -28,7 +28,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -28,7 +28,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -26,7 +26,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/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>
<executions>
<execution>
<id>attach-binary-assembly</id>
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -24,7 +24,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -24,7 +24,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-source-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -29,7 +29,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/goals.txt Mon Aug 18 15:48:59 2008
@@ -1,2 +1,2 @@
clean
-org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -25,7 +25,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/dependency-sets/including-sar-dependency/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/goals.txt Mon Aug 18 15:48:59 2008
@@ -1,2 +1,2 @@
clean
-org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -24,7 +24,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/dependency-sets/massembly-99/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/goals.txt Mon Aug 18 15:48:59 2008
@@ -1,3 +1,3 @@
clean
package
-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/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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -36,7 +36,7 @@
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/bin.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/goals.txt Mon Aug 18 15:48:59 2008
@@ -1,3 +1,3 @@
clean
package
-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/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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -35,7 +35,7 @@
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/bin.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml Mon Aug 18 15:48:59 2008
@@ -18,7 +18,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.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/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -28,7 +28,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.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/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml Mon Aug 18 15:48:59 2008
@@ -28,7 +28,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml Mon Aug 18 15:48:59 2008
@@ -23,7 +23,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml Mon Aug 18 15:48:59 2008
@@ -18,7 +18,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml Mon Aug 18 15:48:59 2008
@@ -18,7 +18,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -25,7 +25,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/file-modes/fileItem-fileMode/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-org.apache.maven.plugins:maven-assembly-plugin:testing:directory
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -25,7 +25,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/file-sets/default-excludes-unspecified/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/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/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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -15,7 +15,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/file-sets/dont-use-default-excludes/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/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/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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -15,7 +15,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/file-sets/excluding-svn-dirs/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/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/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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -15,7 +15,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/file-sets/include-base-directory/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/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/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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -15,7 +15,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/file-sets/include-parent-dir/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml 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/parent.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/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/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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -15,7 +15,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/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-org.apache.maven.plugins:maven-assembly-plugin:testing:assembly
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
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=686889&r1=686888&r2=686889&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 Mon Aug 18 15:48:59 2008
@@ -23,7 +23,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<configuration>
<descriptors>
<descriptor>src/assemble/bin.xml</descriptor>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-install org.apache.maven.plugins:maven-assembly-plugin:testing:assembly
+install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/goals.txt?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/goals.txt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/goals.txt Mon Aug 18 15:48:59 2008
@@ -1 +1 @@
-install org.apache.maven.plugins:maven-assembly-plugin:testing:attached
+install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml Mon Aug 18 15:48:59 2008
@@ -22,7 +22,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml Mon Aug 18 15:48:59 2008
@@ -24,7 +24,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml?rev=686889&r1=686888&r2=686889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml Mon Aug 18 15:48:59 2008
@@ -1,3 +1,4 @@
+
<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>
@@ -15,7 +16,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
+ <version>${testVersion}</version>
<type>maven-plugin</type>
</dependency>
<dependency>
@@ -29,7 +30,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<executions>
<execution>
<id>assembly</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-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-in-one-project-hierarchy/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-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>