Author: jdcasey
Date: Wed May 20 21:51:07 2009
New Revision: 776876
URL: http://svn.apache.org/viewvc?rev=776876&view=rev
Log:
Fixing missing parent declarations in ITs. This can cause the wrong version of
the assembly plugin to be used during testing.
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
Wed May 20 21:51:07 2009
@@ -2,6 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.test</groupId>
+ <artifactId>custom-containerDescriptorHandler</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.test</groupId>
<version>1</version>
<artifactId>handler-def</artifactId>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
Wed May 20 21:51:07 2009
@@ -2,6 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.test</groupId>
+ <artifactId>custom-handler-withFileEntries</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.test</groupId>
<version>1</version>
<artifactId>handler-def</artifactId>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
Wed May 20 21:51:07 2009
@@ -2,6 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.test</groupId>
+ <artifactId>custom-handler-withMixedEntries</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.test</groupId>
<version>1</version>
<artifactId>handler-def</artifactId>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
Wed May 20 21:51:07 2009
@@ -1,5 +1,11 @@
<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>jars-in-archive-root</artifactId>
<packaging>jar</packaging>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
Wed May 20 21:51:07 2009
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>component-descriptors-merged</artifactId>
<packaging>pom</packaging>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
Wed May 20 21:51:07 2009
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
<packaging>pom</packaging>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
Wed May 20 21:51:07 2009
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>multimodule-sources-copied</artifactId>
<packaging>pom</packaging>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
Wed May 20 21:51:07 2009
@@ -1,5 +1,11 @@
<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>sources-copied</artifactId>
<packaging>jar</packaging>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
Wed May 20 21:51:07 2009
@@ -1,5 +1,11 @@
<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>src-dir-copied</artifactId>
<packaging>jar</packaging>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
Wed May 20 21:51:07 2009
@@ -1,10 +1,14 @@
<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>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml?rev=776876&r1=776875&r2=776876&view=diff
==============================================================================
---
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
Wed May 20 21:51:07 2009
@@ -1,10 +1,14 @@
<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>
<dependencies>
<dependency>
<groupId>junit</groupId>
