Merge remote-tracking branch 'upstream/master' into Fix10

# Conflicts:
#	src/test/java/org/codehaus/plexus/interpolation/fixed/FixedStringSearchInterpolatorTest.java

Author: belingueres

README.md

@@ -1,5 +1,7 @@
 Plexus-Interpolation
 ===============
 
+[![Build Status](https://travis-ci.org/codehaus-plexus/plexus-interpolation.svg?branch=master)](https://travis-ci.org/codehaus-plexus/plexus-interpolation)
+
 Components for interpolating `${}` strings and the like.
 

pom.xml

@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>plexus-interpolation</artifactId>
-  <version>1.24-SNAPSHOT</version>
+  <version>1.25-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>Plexus Interpolation API</name>
@@ -17,7 +17,7 @@
     <connection>scm:git:git@github.com:codehaus-plexus/plexus-interpolation.git</connection>
     <developerConnection>scm:git:git@github.com:codehaus-plexus/plexus-interpolation.git</developerConnection>
     <url>http://github.com/codehaus-plexus/plexus-interpolation</url>
-    <tag>HEAD</tag>
+    <tag>plexus-interpolation-1.24</tag>
   </scm>
 
   <issueManagement>

src/main/java/org/codehaus/plexus/interpolation/InterpolatorFilterReader.java

@@ -138,7 +138,7 @@ public InterpolatorFilterReader( Reader in, Interpolator interpolator, String be
      */
     public InterpolatorFilterReader( Reader in, Interpolator interpolator, RecursionInterceptor ri )
     {
-        this( in, interpolator, DEFAULT_BEGIN_TOKEN, DEFAULT_END_TOKEN, new SimpleRecursionInterceptor() );
+        this( in, interpolator, DEFAULT_BEGIN_TOKEN, DEFAULT_END_TOKEN, ri );
     }
 
     /**

src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolator.java

@@ -201,13 +201,17 @@ private String interpolate( String input, RecursionInterceptor recursionIntercep
 
                 if ( startIdx >= 0 && escapeString != null && escapeString.length() > 0 )
                 {
-                    int startEscapeIdx = startIdx == 0 ? 0 : startIdx - escapeString.length();
+                    int startEscapeIdx = ( startIdx == 0 ) ? 0 : startIdx - escapeString.length();
                     if ( startEscapeIdx >= 0 )
                     {
                         String escape = input.substring( startEscapeIdx, startIdx );
                         if ( escape != null && escapeString.equals( escape ) )
                         {
                             result.append( wholeExpr );
+                            if ( startEscapeIdx > 0 )
+                            {
+                                --startEscapeIdx;
+                            }
                             result.replace( startEscapeIdx, startEscapeIdx + escapeString.length(), "" );
                             continue;
                         }
@@ -388,6 +392,12 @@ public void setEscapeString( String escapeString )
     {
         this.escapeString = escapeString;
     }
+
+    public MultiDelimiterStringSearchInterpolator escapeString( String escapeString )
+    {
+        this.escapeString = escapeString;
+        return this;
+    }
 
     public MultiDelimiterStringSearchInterpolator setDelimiterSpecs( LinkedHashSet<String> specs )
     {