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

[MNG-4684] distributionManagment section in profiles do not override default one (maven 3 regression) 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@946980 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-05-21 12:11:53 +00:00
parent 40028e7a18
commit 80903fa4d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
View File

@ -345,7 +345,7 @@ public class MavenModelMerger
if ( src != null )
{
DeploymentRepository tgt = target.getRepository();
if ( tgt == null )
if ( sourceDominant || tgt == null )
{
tgt = new DeploymentRepository();
target.setRepository( tgt );
@ -363,7 +363,7 @@ public class MavenModelMerger
if ( src != null )
{
DeploymentRepository tgt = target.getSnapshotRepository();
if ( tgt == null )
if ( sourceDominant || tgt == null )
{
tgt = new DeploymentRepository();
target.setSnapshotRepository( tgt );
@ -380,7 +380,7 @@ public class MavenModelMerger
if ( src != null )
{
Site tgt = target.getSite();
if ( tgt == null )
if ( sourceDominant || tgt == null )
{
tgt = new Site();
target.setSite( tgt );