You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ke...@apache.org on 2007/07/31 00:49:24 UTC
svn commit: r561173 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
Author: kenney
Date: Mon Jul 30 15:49:24 2007
New Revision: 561173
URL: http://svn.apache.org/viewvc?view=rev&rev=561173
Log:
Fix it0088 / MNG-2124 etc.. (regression)
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?view=diff&rev=561173&r1=561172&r2=561173
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java Mon Jul 30 15:49:24 2007
@@ -148,6 +148,13 @@
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
// I don't think we should deprecate this as it's used in plugin params aswell,
// and project.build.outputDirectory etc. are documented.
@@ -167,13 +174,6 @@
if ( value == null )
{
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 )