This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git.
from 449e6dc [MNG-6873] update junit dependency to 4.13.1 - also in unit tests add 2e66809 [MNG-6952] Fail early if pom cannot be transformed add f211600 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven add 789d75f Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven add 8913502 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven add 2469718 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven new e7eef9d [MNG-6999] Chained (consumer) XMLFilters can result in "floating" comments 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 | 13 +- .../aether/ConsumerModelSourceTransformerTest.java | 70 ++++++++++ .../apache/maven/project/ProjectBuilderTest.java | 92 +++++-------- .../test/resources/projects/transform/after.pom | 2 + .../test/resources/projects/transform/before.pom | 5 + .../building/AbstractModelSourceTransformer.java | 87 ++++++++---- .../building/BuildModelSourceTransformer.java | 11 +- .../building/DefaultBuildPomXMLFilterFactory.java | 6 +- .../maven/model/building/DefaultModelBuilder.java | 2 +- .../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 | 36 ++--- .../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 10 ++ .../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 8 +- .../sax/filter/ConsumerPomXMLFilterFactory.java | 5 +- .../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 | 23 +++- .../maven/xml/sax/filter/ModulesXMLFilterTest.java | 10 +- .../maven/xml/sax/filter/ParentXMLFilterTest.java | 7 +- .../sax/filter/ReactorDependencyXMLFilterTest.java | 9 +- 26 files changed, 513 insertions(+), 186 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