Author: jdcasey
Date: Mon Mar 30 20:28:47 2009
New Revision: 760156
URL: http://svn.apache.org/viewvc?rev=760156&view=rev
Log:
add parent section to make sure the appropriate assembly plugin version is used
during the integration test.
Modified:
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
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=760156&r1=760155&r2=760156&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 Mar 30 20:28:47 2009
@@ -1,7 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
+ <parent>
+ <groupId>test</groupId>
+ <artifactId>single-twice-in-multimodule-hierarchy</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>child1</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
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=760156&r1=760155&r2=760156&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 Mar 30 20:28:47 2009
@@ -1,7 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
+ <parent>
+ <groupId>test</groupId>
+ <artifactId>single-twice-in-multimodule-hierarchy</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>child2</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
