Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug I introduced 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165090 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-04-28 03:31:49 +00:00
parent bd286bfc46
commit 05ebfd3b91
1 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
View File

@ -312,9 +312,12 @@ public class DefaultModelInheritanceAssembler
Build childBuild = child.getBuild();
Build parentBuild = parent.getBuild();
if ( parentBuild != null )
{
if ( childBuild == null )
{
child.setBuild( new Build() );
childBuild = new Build();
child.setBuild( childBuild );
}
// The build has been set but we want to step in here and fill in
// values
@ -371,6 +374,7 @@ public class DefaultModelInheritanceAssembler
assemblePluginManagementInheritance( childBuild, parentBuild );
}
}
private void assembleScmInheritance( Model child, Model parent )
{