Author: bentmann
Date: Fri Jan 30 13:40:38 2009
New Revision: 739274
URL: http://svn.apache.org/viewvc?rev=739274&view=rev
Log:
[MNG-1992] CLI -D should override properties in settings.xml
o Merged from r572229
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 30 13:40:38 2009
@@ -2,4 +2,4 @@
/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
-/maven/components/trunk:720001,721902,726845,729292
+/maven/components/trunk:572229,720001,721902,726845,729292
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=739274&r1=739273&r2=739274&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Fri Jan 30 13:40:38 2009
@@ -295,11 +295,7 @@
if ( value == null )
{
- // Check POM-level properties before we default over to system
properties.
- if ( project != null && project.getProperties() != null )
- {
- value = project.getProperties().getProperty( expression );
- }
+ // The CLI should win for defining properties
if ( value == null && properties != null )
{
@@ -310,6 +306,12 @@
value = properties.getProperty( expression );
}
+
+ if ( value == null && project != null && project.getProperties()
!= null )
+ {
+ value = project.getProperties().getProperty( expression );
+ }
+
}
if ( value instanceof String )
