From ed863374c5f2be0f20674ad00cc72f0466fc663d Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Tue, 19 Feb 2008 21:31:56 +0000 Subject: [PATCH] Quiet down all the deprecated-expression stuff to debug log-level until we get serious about fixing this in poms. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629240 13f79535-47bb-0310-9956-ffa450edef68 --- .../interpolation/RegexBasedModelInterpolator.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java index a93b7e623e..42b8932909 100644 --- a/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java +++ b/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java @@ -55,7 +55,7 @@ public class RegexBasedModelInterpolator public RegexBasedModelInterpolator() throws IOException { - envars = CommandLineUtils.getSystemEnvVars(); + envars = CommandLineUtils.getSystemEnvVars(); } public Model interpolate( Model model, Map context ) @@ -153,7 +153,7 @@ public class RegexBasedModelInterpolator // Check for special expressions that should NOT be interpolated. // See DefaultProjectBuilder and MNG-2124/MNG-1927. - if ( context.get( realExpr ) == null && context.containsKey( realExpr ) ) + if ( ( context.get( realExpr ) == null ) && context.containsKey( realExpr ) ) { continue; } @@ -189,16 +189,16 @@ public class RegexBasedModelInterpolator value = envars.getProperty( realExpr ); } - // Any expression, not just artifactId, version etc., but also scm.repository + // Any expression, not just artifactId, version etc., but also scm.repository // were evaluated against the model, even if there is no prefix. // If the 2.1 strategy fails, try the legacy approach. If it yields a result, warn for it. - if ( value == null && prefix.length() == 0 ) + if ( ( value == null ) && ( prefix.length() == 0 ) ) { value = getValueFromModel( realExpr, model, wholeExpr, logger ); - if ( isSnapshotModel && value != null && logger != null ) + if ( isSnapshotModel && ( value != null ) && ( logger != null ) ) { - logger.warn( "Deprecated expression: " + wholeExpr + " - missing prefix. Use ${pom." + logger.debug( "Expression: " + wholeExpr + " is missing its prefix. Instead, use ${pom." + realExpr + "} (model: " + model.getId() + ")" ); } } @@ -222,7 +222,7 @@ public class RegexBasedModelInterpolator matcher.reset( result ); } - + /* // This is the desired behaviour, however there are too many crappy poms in the repo and an issue with the // timing of executing the interpolation