[plexus-interpolation] 06/10: Merge tag 'upstream/1.24'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-interpolation.

commit 6a2af6cbda269b48cb61de207c65f2243d0c1df4
Merge: 4124bbf 2b6d2d1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 18 15:04:53 2017 +0200

    Merge tag 'upstream/1.24'
    
    Upstream version 1.24

 .travis.yml                                        |  16 +
 README.md                                          |   7 +
 pom.xml                                            |  74 ++-
 release.properties                                 |  12 -
 .../plexus/interpolation/BasicInterpolator.java    |  53 +++
 .../FixedInterpolatorValueSource.java              |  40 ++
 .../plexus/interpolation/Interpolator.java         |  31 +-
 .../interpolation/InterpolatorFilterReader.java    |   2 +-
 .../PrefixAwareRecursionInterceptor.java           |   4 +
 .../plexus/interpolation/RecursionInterceptor.java |   5 +
 .../interpolation/SimpleRecursionInterceptor.java  |   3 +
 .../interpolation/StringSearchInterpolator.java    |   4 +-
 .../fixed/AbstractDelegatingValueSource.java       |  43 ++
 .../interpolation/fixed/EnvarBasedValueSource.java | 113 +++++
 .../fixed/FixedStringSearchInterpolator.java       | 301 ++++++++++++
 .../interpolation/fixed/FixedValueSource.java      |  27 ++
 .../fixed/InterpolationCycleException.java         |  34 ++
 .../interpolation/fixed/InterpolationState.java    |  71 +++
 .../interpolation/fixed/MapBasedValueSource.java   |  49 ++
 .../fixed/ObjectBasedValueSource.java              |  74 +++
 .../fixed/PrefixedObjectValueSource.java           |  53 +++
 .../fixed/PrefixedPropertiesValueSource.java       |  67 +++
 .../fixed/PrefixedValueSourceWrapper.java          | 124 +++++
 .../fixed/PropertiesBasedValueSource.java          |  59 +++
 .../MultiDelimiterStringSearchInterpolator.java    |  12 +-
 .../object/FieldBasedObjectInterpolator.java       |   9 +-
 .../interpolation/object/ObjectInterpolator.java   |   5 +-
 .../fixed/FixedStringSearchInterpolatorTest.java   | 512 +++++++++++++++++++++
 ...MultiDelimiterStringSearchInterpolatorTest.java |  57 +++
 29 files changed, 1787 insertions(+), 74 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-interpolation.git