svn commit: r1038391 - /maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java

[bentmann]

Author: bentmann
Date: Wed Nov 24 00:04:21 2010
New Revision: 1038391

URL: http://svn.apache.org/viewvc?rev=1038391&view=rev
Log:
[MNG-4913] [regression] User properties override equally named POM properties 
of transitive dependencies

Modified:
    
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java

Modified: 
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java?rev=1038391&r1=1038390&r2=1038391&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
 (original)
+++ 
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
 Wed Nov 24 00:04:21 2010
@@ -282,8 +282,8 @@ public class DefaultArtifactDescriptorRe
                 modelRequest.setValidationLevel( 
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
                 modelRequest.setProcessPlugins( false );
                 modelRequest.setTwoPhaseBuilding( false );
-                modelRequest.setSystemProperties( toProperties( 
session.getSystemProperties() ) );
-                modelRequest.setUserProperties( toProperties( 
session.getUserProperties() ) );
+                modelRequest.setSystemProperties( toProperties( 
session.getUserProperties(),
+                                                                
session.getSystemProperties() ) );
                 modelRequest.setModelCache( DefaultModelCache.newInstance( 
session ) );
                 modelRequest.setModelResolver( new DefaultModelResolver( 
session, request.getRequestContext(),
                                                                          
artifactResolver, remoteRepositoryManager,
@@ -335,12 +335,16 @@ public class DefaultArtifactDescriptorRe
         }
     }
 
-    private Properties toProperties( Map<String, String> map )
+    private Properties toProperties( Map<String, String> dominant, Map<String, 
String> recessive )
     {
         Properties props = new Properties();
-        if ( map != null )
+        if ( recessive != null )
         {
-            props.putAll( map );
+            props.putAll( recessive );
+        }
+        if ( dominant != null )
+        {
+            props.putAll( dominant );
         }
         return props;
     }