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

[MNG-2745,MNG-2753] more completely remove env vars - no point in populating them if they are never used 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494710 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2007-01-10 04:40:39 +00:00
parent 028a4464de
commit c416a33a4c
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,17 +47,9 @@ public class RegexBasedModelInterpolator
{
private static final Pattern EXPRESSION_PATTERN = Pattern.compile( "\\$\\{(pom\\.|project\\.|env\\.)?([^}]+)\\}" );
private Properties envars;
public RegexBasedModelInterpolator( Properties envars )
{
this.envars = envars;
}
public RegexBasedModelInterpolator()
throws IOException
{
envars = CommandLineUtils.getSystemEnvVars();
}
public Model interpolate( Model model, Map context )
@ -158,17 +150,6 @@ public class RegexBasedModelInterpolator
}
}
/*
MNG-2745: don't interpolate system properties in the POM. Bad dog!
if ( value == null )
{
value = envars.getProperty( realExpr );
}
*/
// if the expression refers to itself, skip it.
if ( String.valueOf( value ).indexOf( wholeExpr ) > -1 )
{