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 2011/08/11 18:45:55 UTC
svn commit: r1156671 -
/maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Author: bentmann
Date: Thu Aug 11 16:45:55 2011
New Revision: 1156671
URL: http://svn.apache.org/viewvc?rev=1156671&view=rev
Log:
[MNG-5153] ModelMerger omits relativ path
Modified:
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Modified: maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=1156671&r1=1156670&r2=1156671&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java (original)
+++ maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java Thu Aug 11 16:45:55 2011
@@ -161,6 +161,7 @@ public class ModelMerger
if ( tgt == null )
{
tgt = new Parent();
+ tgt.setRelativePath( null );
target.setParent( tgt );
}
mergeParent( tgt, src, sourceDominant, context );
@@ -430,6 +431,7 @@ public class ModelMerger
if ( tgt == null )
{
tgt = new Scm();
+ tgt.setTag( null );
target.setScm( tgt );
}
mergeScm( tgt, src, sourceDominant, context );
@@ -462,6 +464,7 @@ public class ModelMerger
if ( tgt == null )
{
tgt = new Prerequisites();
+ tgt.setMaven( null );
target.setPrerequisites( tgt );
}
mergePrerequisites( tgt, src, sourceDominant, context );