This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git.
from b9607f0 fix merge
add e7eef9d [MNG-6999] Chained (consumer) XMLFilters can result in
"floating" comments
new b6f0b12 Merge branch 'master' into MNG-6957
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../aether/ConsumerModelSourceTransformer.java | 12 +-
.../aether/ConsumerModelSourceTransformerTest.java | 70 ++++++++++
.../apache/maven/project/ProjectBuilderTest.java | 88 +++++-------
.../test/resources/projects/transform/after.pom | 2 +
.../test/resources/projects/transform/before.pom | 5 +
.../building/AbstractModelSourceTransformer.java | 64 +++++----
.../building/BuildModelSourceTransformer.java | 9 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 19 ++-
.../DefaultInheritanceAssemblerTest.java | 7 +-
.../xml/sax/filter/AbstractEventXMLFilter.java | 6 +-
.../maven/xml/sax/filter/AbstractSAXFilter.java | 9 +-
.../maven/xml/sax/filter/BuildPomXMLFilter.java | 3 +-
.../xml/sax/filter/BuildPomXMLFilterFactory.java | 48 ++++---
.../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 18 ++-
.../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 8 +-
.../sax/filter/ConsumerPomXMLFilterFactory.java | 3 +-
.../maven/xml/sax/filter/FastForwardFilter.java | 4 +-
.../maven/xml/sax/filter/ModulesXMLFilter.java | 4 +-
.../xml/sax/filter/RelativePathXMLFilter.java | 4 +-
.../apache/maven/xml/sax/ChainedFilterTest.java | 150 +++++++++++++++++++++
.../xml/sax/filter/AbstractXMLFilterTests.java | 116 +++++++++-------
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 27 +++-
.../maven/xml/sax/filter/ModulesXMLFilterTest.java | 10 +-
.../maven/xml/sax/filter/ParentXMLFilterTest.java | 5 +-
.../sax/filter/ReactorDependencyXMLFilterTest.java | 9 +-
25 files changed, 498 insertions(+), 202 deletions(-)
create mode 100644
maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
copy maven-model-builder/src/test/resources/poms/factory/simple.xml =>
maven-core/src/test/resources/projects/transform/after.pom (99%)
copy maven-model-builder/src/test/resources/poms/factory/simple.xml =>
maven-core/src/test/resources/projects/transform/before.pom (95%)
create mode 100644
maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java
