You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by jd...@apache.org on 2005/11/23 18:01:12 UTC

svn commit: r348489 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java

Author: jdcasey
Date: Wed Nov 23 09:01:09 2005
New Revision: 348489

URL: http://svn.apache.org/viewcvs?rev=348489&view=rev
Log:
PR: MNG-1666
Submitted By: John Casey

Fixed escaped expression handling in the plugin parameter expression evaluator. '$$' was not being replaced by '$' correctly.

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=348489&r1=348488&r2=348489&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Wed Nov 23 09:01:09 2005
@@ -142,7 +142,14 @@
             }
 
             // Was not an expression
-            return expression.replaceAll( "\\$\\$", "$" );
+            if ( expression.indexOf( "$$" ) > -1 )
+            {
+                return expression.replaceAll( "\\$\\$", "\\$" );
+            }
+            else
+            {
+                return expression;
+            }
         }
 
         MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();