svn commit: r696713 - in /maven/components/trunk: maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java pom.xml

[si...@apache.org]

Author: sisbell
Date: Thu Sep 18 10:02:55 2008
New Revision: 696713

URL: http://svn.apache.org/viewvc?rev=696713&view=rev
Log:
Fix: If the child pom found a parent pom within a local build, where the child pom project/parent/groupId[artifactId] did not match the groupId[artifactId] of the parent pom, then it would exclude the parent pom from inheritance. Now it will attempt to locate the parent pom in the local repo. If the parent pom is not found in local repo, build will fail.

Modified:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
    maven/components/trunk/pom.xml

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=696713&r1=696712&r2=696713&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Thu Sep 18 10:02:55 2008
@@ -310,6 +310,15 @@
             logger.warn( "Parent pom ids do not match: Parent File = " + parentFile.getAbsolutePath() + ", Parent ID = "
                     + parentDomainModel.getId() + ", Child ID = " + domainModel.getId() + ", Expected Parent ID = "
                     + domainModel.getModel().getParent().getId() );
+            List<DomainModel> parentDomainModels = getDomainModelParentsFromRepository( domainModel, artifactResolver );
+            if(parentDomainModels.size() == 0)
+            {
+                throw new IOException("Unable to find parent pom on local path or repo: "
+                        + domainModel.getModel().getParent().getId());
+            }
+            logger.info("Attempting to lookup from the repository: Found parents: " + parentDomainModels.size());
+            domainModels.addAll( parentDomainModels );
+            return domainModels;
         }
 
         domainModels.add( parentDomainModel );

Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=696713&r1=696712&r2=696713&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Sep 18 10:02:55 2008
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>9-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>    
   <modelVersion>4.0.0</modelVersion>