Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-06 10:09:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MNG-5153] ModelMerger omits relativ path

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1156671 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2011-08-11 16:45:55 +00:00
parent d5b19f8fd3
commit decce3a120
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
View File

@ -161,6 +161,7 @@ protected void mergeModel_Parent( Model target, Model source, boolean sourceDomi
if ( tgt == null )
{
tgt = new Parent();
tgt.setRelativePath( null );
target.setParent( tgt );
}
mergeParent( tgt, src, sourceDominant, context );
@ -430,6 +431,7 @@ protected void mergeModel_Scm( Model target, Model source, boolean sourceDominan
if ( tgt == null )
{
tgt = new Scm();
tgt.setTag( null );
target.setScm( tgt );
}
mergeScm( tgt, src, sourceDominant, context );
@ -462,6 +464,7 @@ protected void mergeModel_Prerequisites( Model target, Model source, boolean sou
if ( tgt == null )
{
tgt = new Prerequisites();
tgt.setMaven( null );
target.setPrerequisites( tgt );
}
mergePrerequisites( tgt, src, sourceDominant, context );