You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by br...@apache.org on 2008/02/29 07:54:33 UTC

svn commit: r632240 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Author: brett
Date: Thu Feb 28 22:54:32 2008
New Revision: 632240

URL: http://svn.apache.org/viewvc?rev=632240&view=rev
Log:
[MNG-2339] must use the previous context so we don't re-expose MNG-1927

Modified:
    maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=632240&r1=632239&r2=632240&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Feb 28 22:54:32 2008
@@ -987,9 +987,10 @@
         context.put( "build.testSourceDirectory", null );
 
         model = modelInterpolator.interpolate( model, context, strict );
-
+        
         // [MNG-2339] ensure the system properties are still interpolated for backwards compat, but the model values must win
-        model = modelInterpolator.interpolate( model, System.getProperties(), strict );
+        context.putAll( System.getProperties() );
+        model = modelInterpolator.interpolate( model, context, strict );
 
         // interpolation is before injection, because interpolation is off-limits in the injected variables
         modelDefaultsInjector.injectDefaults( model );