.travis.yml

@@ -2,6 +2,7 @@ language: java
 jdk:
   - openjdk7
   - oraclejdk8
+  - openjdk11
 
 script: "mvn --show-version --errors --batch-mode -Prun-its clean verify"
 
@@ -13,5 +14,4 @@ branches:
         - gh-pages
 notifications:
     email:
-        - olamy@apache.org
         - kama@soebes.de

README.md

@@ -2,13 +2,13 @@ Plexus-Interpolation
 ===============
 
 [![Build Status](https://travis-ci.org/codehaus-plexus/plexus-interpolation.svg?branch=master)](https://travis-ci.org/codehaus-plexus/plexus-interpolation)
-[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-interpolation.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%plexus-interpolation%22)
+[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-interpolation.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.codehaus.plexus%22%20AND%20a%3A%22plexus-interpolation%22)
 
 The current master is now at https://github.com/codehaus-plexus/plexus-interpolation
 
 Components for interpolating `${}` strings and the like.
 
-For publishing [the site](https://codehaus-plexus.github.io/plexus-io/) do the following:
+For publishing [the site](https://codehaus-plexus.github.io/plexus-interpolation/) do the following:
 
 ```
 mvn -Preporting verify site-deploy

debian/changelog

+plexus-interpolation (1.26-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Removed the -java-doc package
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 07 Jul 2019 22:58:19 +0200
+
 plexus-interpolation (1.25-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -8,12 +8,10 @@ Uploaders:
 Build-Depends:
  debhelper (>= 11~),
  default-jdk,
- default-jdk-doc,
  junit4,
  libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java,
  maven-debian-helper (>= 2.2~)
-Standards-Version: 4.1.5
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/plexus-interpolation.git
 Vcs-Browser: https://salsa.debian.org/java-team/plexus-interpolation
 Homepage: https://github.com/codehaus-plexus/plexus-interpolation
@@ -22,7 +20,6 @@ Package: libplexus-interpolation-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
-Suggests: libplexus-interpolation-java-doc
 Description: Plexus Interpolation API
  The Plexus project provides a full software stack for creating and executing
  software projects. Based on the Plexus container, the applications can
@@ -45,34 +42,3 @@ Description: Plexus Interpolation API
  Plexus interpolator is focused on providing a more modular, flexible
  interpolation framework for the expression language style commonly seen in
  Maven, Plexus, and other related projects.
-
-Package: libplexus-interpolation-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libplexus-interpolation-java
-Description: Documentation for Plexus Interpolation API
- The Plexus project provides a full software stack for creating and executing
- software projects. Based on the Plexus container, the applications can
- utilise component-oriented programming to build modular, reusable components
- that can easily be assembled and reused.
- .
- While Plexus is similar to other inversion-of-control (IoC) or dependency
- injection frameworks such as the Spring Framework, it is a full-fledged
- container that supports many more features such as:
- .
-     * Component lifecycles
-     * Component instantiation strategies
-     * Nested containers
-     * Component configuration
-     * Auto-wiring
-     * Component dependencies, and
-     * Various dependency injection techniques including constructor injection,
-       setter injection, and private field injection.
- .
- Plexus interpolator is focused on providing a more modular, flexible
- interpolation framework for the expression language style commonly seen in
- Maven, Plexus, and other related projects.
- .
- This package contains the API documentation of libplexus-interpolation-java.

debian/libplexus-interpolation-java-doc.doc-base.api

-Document: libplexus-interpolation-java
-Title: API Javadoc for Plexus Interpolation API
-Author: Plexus Interpolation API developers
-Abstract: This is the API Javadoc provided for the
- libplexus-interpolation-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-interpolation-java/api/index.html
-Files: /usr/share/doc/libplexus-interpolation-java/api/*

debian/libplexus-interpolation-java-doc.install

-target/apidocs/* usr/share/doc/libplexus-interpolation-java/api

pom.xml

@@ -8,16 +8,16 @@
   </parent>
 
   <artifactId>plexus-interpolation</artifactId>
-  <version>1.25</version>
+  <version>1.26</version>
   <packaging>bundle</packaging>
 
   <name>Plexus Interpolation API</name>
 
   <scm>
-    <connection>scm:git:git@github.com:codehaus-plexus/plexus-interpolation.git</connection>
-    <developerConnection>scm:git:git@github.com:codehaus-plexus/plexus-interpolation.git</developerConnection>
+    <connection>scm:git:https://github.com/codehaus-plexus/plexus-interpolation.git</connection>
+    <developerConnection>scm:git:https://github.com/codehaus-plexus/plexus-interpolation.git</developerConnection>
     <url>http://github.com/codehaus-plexus/plexus-interpolation/tree/${project.scm.tag}/</url>
-    <tag>plexus-interpolation-1.25</tag>
+    <tag>plexus-interpolation-1.26</tag>
   </scm>
 
   <issueManagement>

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

@@ -138,11 +138,13 @@ public class StringSearchInterpolator
             // return empty String to prevent NPE too
             return "";
         }
-        StringBuilder result = new StringBuilder( input.length() * 2 );
 
         int startIdx;
         int endIdx = -1;
-        while ( ( startIdx = input.indexOf( startExpr, endIdx + 1 ) ) > -1 )
+        if ( ( startIdx = input.indexOf( startExpr, endIdx + 1 ) ) > -1 )
+        {
+            StringBuilder result = new StringBuilder( input.length() * 2 );
+            do
                 {
                 result.append( input, endIdx + 1, startIdx );
 
@@ -257,6 +259,7 @@ public class StringSearchInterpolator
                     endIdx += endExpr.length() - 1;
                 }
             }
+            while ( ( startIdx = input.indexOf( startExpr, endIdx + 1 ) ) > -1);
 
             if ( endIdx == -1 && startIdx > -1 )
             {
@@ -269,6 +272,11 @@ public class StringSearchInterpolator
 
             return result.toString();
         }
+        else
+        {
+            return input;
+        }
+    }
 
     /**
      * Return any feedback messages and errors that were generated - but