svn commit: r693306 - /maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java

[jdcasey]

Author: jdcasey
Date: Mon Sep  8 15:37:37 2008
New Revision: 693306

URL: http://svn.apache.org/viewvc?rev=693306&view=rev
Log:
[MNG-3746] Ensure that CLI properties from -D options override those in the POM 
properties.

Modified:
    
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java

Modified: 
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java?rev=693306&r1=693305&r2=693306&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
 (original)
+++ 
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
 Mon Sep  8 15:37:37 2008
@@ -247,6 +247,7 @@
         valueSources.add( basedirValueSource );
         valueSources.add( new BuildTimestampValueSource( 
config.getBuildStartTime(), timestampFormat ) );
         valueSources.add( modelValueSource1 );
+        valueSources.add( new MapBasedValueSource( config.getUserProperties() 
) );
         valueSources.add( new PrefixedValueSourceWrapper( new 
MapBasedValueSource( modelProperties ), PROJECT_PREFIXES, true ) );
         valueSources.add( new MapBasedValueSource( 
config.getExecutionProperties() ) );
         valueSources.add( new AbstractValueSource( false )
@@ -257,7 +258,6 @@
             }
         } );
         valueSources.add( modelValueSource2 );
-        valueSources.add( new MapBasedValueSource( config.getUserProperties() 
) );
         
         return valueSources;
     }