svn commit: r553144 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java

[ke...@apache.org]

Author: kenney
Date: Wed Jul  4 02:48:06 2007
New Revision: 553144

URL: http://svn.apache.org/viewvc?view=rev&rev=553144
Log:
reduced warning-noise: only print warnings for SNAPSHOT models, and removed deprecation for project.* expressions, see comment in code

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=553144&r1=553143&r2=553144
==============================================================================
--- 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 Wed Jul  4 02:48:06 2007
@@ -130,6 +130,10 @@
     {
         Logger logger = getLogger();
 
+        boolean isSnapshotModel = ( model.getVersion() == null
+            ? model.getParent() == null ? "" : model.getParent().getVersion()
+            : model.getVersion() ).indexOf( "SNAPSHOT" ) >= 0;
+
         String result = src;
         Matcher matcher = EXPRESSION_PATTERN.matcher( result );
         while ( matcher.find() )
@@ -144,11 +148,16 @@
 
             boolean isPomExpression = "pom.".equals( prefix ) || "project.".equals( prefix );
 
-            if ( logger != null && "project.".equals( prefix ) )
-            {
-                logger.warn( "Deprecated expression: " + wholeExpr + " - 'project.' prefix is deprecated."
-                    + " Use 'pom.': ${pom." + realExpr + "} (model: " + model.getId() + ")" );
-            }
+// TODO
+// I don't think we should deprecate this as it's used in plugin params aswell,
+// and project.build.outputDirectory etc. are documented.
+// For now I'll allow both pom. and project.
+// Perhaps pom. should be deprecated instead?
+//            if ( isSnapshotModel && logger != null && "project.".equals( prefix ) )
+//            {
+//                logger.warn( "Deprecated expression: " + wholeExpr + " - 'project.' prefix is deprecated."
+//                    + " Use 'pom.': ${pom." + realExpr + "} (model: " + model.getId() + ")" );
+//            }
 
             if ( isPomExpression )
             {
@@ -179,7 +188,7 @@
             {
                 value = getValueFromModel( realExpr, model, wholeExpr, logger );
 
-                if ( value != null && logger != null )
+                if ( isSnapshotModel && value != null && logger != null )
                 {
                     logger.warn( "Deprecated expression: " + wholeExpr + " - missing prefix. Use ${pom."
                         + realExpr + "} (model: " + model.getId() + ")" );