Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o revert my ordering, i'll have to investigate why property set on the CLI which conflicts with an internal property still wins in 2.0.x 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701702 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-10-04 19:51:42 +00:00
parent 1289a0e877
commit a2f245109b
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View File

@ -222,21 +222,6 @@ public class PluginParameterExpressionEvaluator
mojoDescriptor.getGoal() + "\' has been deprecated. Use \'" + DEPRECATED_EXPRESSIONS.get( expression ) +
"\' instead." );
}
// We will attempt to get nab a system property as a way to specify a
// parameter to a plugins. My particular case here is allowing the surefire
// plugin to run a single test so I want to specify that class on the cli
// as a parameter.
if ( properties != null )
{
value = properties.getProperty( expression );
if ( value != null )
{
return value;
}
}
if ( "localRepository".equals( expression ) )
{
@ -336,6 +321,7 @@ public class PluginParameterExpressionEvaluator
value = ReflectionValueExtractor.evaluate( pathExpression, pluginDescriptor );
value = value + expression.substring( pathSeparator );
}
else
{
value = ReflectionValueExtractor.evaluate( expression.substring( 1 ), pluginDescriptor );
@ -396,6 +382,16 @@ public class PluginParameterExpressionEvaluator
if ( value == null )
{
// We will attempt to get nab a system property as a way to specify a
// parameter to a plugins. My particular case here is allowing the surefire
// plugin to run a single test so I want to specify that class on the cli
// as a parameter.
if ( properties != null )
{
value = properties.getProperty( expression );
}
if ( project != null && project.getProperties() != null )
{
value = project.getProperties().getProperty( expression );