Author: jdcasey
Date: Thu Nov 17 11:31:33 2005
New Revision: 345313
URL: http://svn.apache.org/viewcvs?rev=345313&view=rev
Log:
Added code to assembleLineage(..) in DefaultMavenProjectBuilder that enforces
the rule that parent POMs should have packaging == 'pom'.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Nov 17 11:31:33 2005
@@ -971,7 +971,7 @@
if ( model != null && !"pom".equals( model.getPackaging() ) )
{
- throw new ProjectBuildingException( projectId, "Project's
parent has wrong packaging: " + model.getPackaging() + ". Must be 'pom'." );
+ throw new ProjectBuildingException( projectId, "Parent: " +
model.getId() + " of project: " + projectId + " has wrong packaging: " +
model.getPackaging() + ". Must be 'pom'." );
}
File parentProjectDir = null;
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p0</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p0</name>
<version>1.0</version>
<organization>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p1</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p1</name>
<version>1.0</version>
<scm>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p2</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p2</name>
<version>1.0</version>
<mailingLists>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p3</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p3</name>
<version>1.0</version>
<inceptionYear>2000</inceptionYear>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p0</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p0</name>
<version>1.0</version>
<organization>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p1</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p1</name>
<version>1.0</version>
<organization>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p2</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p2</name>
<version>1.0</version>
<organization>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom?rev=345313&r1=345312&r2=345313&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom
Thu Nov 17 11:31:33 2005
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>p3</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p3</name>
<version>1.0</version>
<organization>
