You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mk...@apache.org on 2006/09/20 08:37:40 UTC
svn commit: r448095 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: mkleint
Date: Tue Sep 19 23:37:40 2006
New Revision: 448095
URL: http://svn.apache.org/viewvc?view=rev&rev=448095
Log:
put a resolved parent artifact in the final mavenproject instance
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diff&rev=448095&r1=448094&r2=448095
==============================================================================
--- 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 Tue Sep 19 23:37:40 2006
@@ -891,6 +891,8 @@
MavenProject parentProject = project.getParent();
Model originalModel = project.getOriginalModel();
+
+ Artifact parentArtifact = project.getParentArtifact();
// We will return a different project object using the new model (hence the need to return a project, not just modify the parameter)
project = new MavenProject( model );
@@ -923,9 +925,10 @@
if ( parentProject != null )
{
- Artifact parentArtifact = artifactFactory.createParentArtifact( parentProject.getGroupId(),
- parentProject.getArtifactId(),
- parentProject.getVersion() );
+// Artifact parentArtifact = artifactFactory.createParentArtifact( parentProject.getGroupId(),
+// parentProject.getArtifactId(),
+// parentProject.getVersion() );
+ // the parent artifact from the parameter passed project instance is resolved.
project.setParentArtifact( parentArtifact );
}