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

Fix it0088 / MNG-2124 etc.. (regression) 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561173 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kenney Westerhof 2007-07-30 22:49:24 +00:00
parent 6583991465
commit 5ec1f2d3cc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
View File

@ -148,6 +148,13 @@ public class RegexBasedModelInterpolator
boolean isPomExpression = "pom.".equals( prefix ) || "project.".equals( prefix ); boolean isPomExpression = "pom.".equals( prefix ) || "project.".equals( prefix );
// Check for special expressions that should NOT be interpolated.
// See DefaultProjectBuilder and MNG-2124/MNG-1927.
if ( context.get( realExpr ) == null && context.containsKey( realExpr ) )
{
continue;
}
// TODO // TODO
// I don't think we should deprecate this as it's used in plugin params aswell, // I don't think we should deprecate this as it's used in plugin params aswell,
// and project.build.outputDirectory etc. are documented. // and project.build.outputDirectory etc. are documented.
@ -167,13 +174,6 @@ public class RegexBasedModelInterpolator
if ( value == null ) if ( value == null )
{ {
value = context.get( realExpr ); value = context.get( realExpr );
// This may look out of place, but its here for the MNG-2124/MNG-1927 fix described in the project builder
if ( value == null && context.containsKey( realExpr ) )
{
// It existed, but was null. Leave it alone.
continue;
}
} }
if ( value == null ) if ( value == null )