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 2010/05/21 14:11:53 UTC

svn commit: r946980 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Author: bentmann
Date: Fri May 21 12:11:53 2010
New Revision: 946980

URL: http://svn.apache.org/viewvc?rev=946980&view=rev
Log:
[MNG-4684] distributionManagment section in profiles do not override default one (maven 3 regression)

Modified:
    maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=946980&r1=946979&r2=946980&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java Fri May 21 12:11:53 2010
@@ -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 );