You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by be...@apache.org on 2010/09/02 21:50:53 UTC

svn commit: r992083 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

Author: bentmann
Date: Thu Sep  2 19:50:53 2010
New Revision: 992083

URL: http://svn.apache.org/viewvc?rev=992083&view=rev
Log:
[MNG-4791] [regression] POM artifacts passed into MavenProjectBuilder.buildFromRepository() are no longer resolved

Modified:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=992083&r1=992082&r2=992083&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Thu Sep  2 19:50:53 2010
@@ -251,6 +251,13 @@ public class DefaultProjectBuilder
 
         File pomFile = pomArtifact.getFile();
 
+        if ( "pom".equals( artifact.getType() ) )
+        {
+            artifact.selectVersion( pomArtifact.getVersion() );
+            artifact.setFile( pomFile );
+            artifact.setResolved( true );
+        }
+
         return build( localProject ? pomFile : null, new FileModelSource( pomFile ), configuration );
     }