[maven-filtering] 25/32: Merge tag 'upstream/3.0.0'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-filtering.

commit 52e963c5ca1ab61928e9ab70b618abf3032d9b44
Merge: 2b0c0e3 800499d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 17 17:17:04 2017 +0200

    Merge tag 'upstream/3.0.0'
    
    Upstream version 3.0.0

 pom.xml                                            |  70 +--
 .../filtering/AbstractFilterReaderLineEnding.java  | 114 +++++
 .../filtering/AbstractMavenFilteringRequest.java   | 130 +++--
 .../apache/maven/shared/filtering/BaseFilter.java  | 570 +++++++++++----------
 .../maven/shared/filtering/BoundedReader.java      | 112 ++--
 .../maven/shared/filtering/DefaultFilterInfo.java  |  83 ++-
 .../shared/filtering/DefaultMavenFileFilter.java   |  53 +-
 .../shared/filtering/DefaultMavenReaderFilter.java |  34 +-
 .../filtering/DefaultMavenResourcesFiltering.java  | 101 ++--
 .../maven/shared/filtering/FilteringUtils.java     |  18 +-
 .../InterpolatorFilterReaderLineEnding.java        | 127 ++---
 .../maven/shared/filtering/MavenFileFilter.java    |  59 ++-
 .../shared/filtering/MavenFileFilterRequest.java   |  66 ++-
 .../shared/filtering/MavenFilteringException.java  |  14 +-
 .../maven/shared/filtering/MavenReaderFilter.java  |  36 +-
 .../shared/filtering/MavenReaderFilterRequest.java |  31 +-
 .../shared/filtering/MavenResourcesExecution.java  | 190 ++++---
 .../shared/filtering/MavenResourcesFiltering.java  |  45 +-
 ...elimiterInterpolatorFilterReaderLineEnding.java | 135 ++---
 .../maven/shared/filtering/PropertyUtils.java      |  34 +-
 src/site/apt/index.apt.vm                          |   2 +-
 src/site/apt/usage.apt                             |   8 +-
 src/site/xdoc/download.xml.vm                      |   2 +-
 ...ractInterpolatorFilterReaderLineEndingTest.java | 243 +++++----
 .../maven/shared/filtering/BoundedReaderTest.java  | 128 +++--
 .../filtering/DefaultMavenFileFilterTest.java      |  28 +-
 .../filtering/DefaultMavenReaderFilterTest.java    |  14 +-
 .../DefaultMavenResourcesFilteringTest.java        | 202 ++++----
 .../maven/shared/filtering/EscapeStringTest.java   |  21 +-
 .../maven/shared/filtering/FilteringUtilsTest.java |  25 +-
 .../IncrementalResourceFilteringTest.java          |  40 +-
 .../InterpolatorFilterReaderLineEndingTest.java    | 114 +++--
 .../maven/shared/filtering/InvalidMarkTest.java    |  17 +-
 .../MuliLinesMavenResourcesFilteringTest.java      |  29 +-
 ...iterInterpolatorFilterReaderLineEndingTest.java | 242 ++++-----
 .../maven/shared/filtering/StubMavenProject.java   |  15 +-
 .../maven/shared/filtering/StubMavenSession.java   |  12 +-
 .../shared/filtering/TestReflectionProperties.java |  20 +-
 38 files changed, 1640 insertions(+), 1544 deletions(-)

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