This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 21be0b1 [MNG-6656] Don't post-process when model has errors
add 6f5f1f1 updated GitHub repository description
add 56d4ea5 added link to documentation
add 00654c2 [MNG-6810] - Remove profiles in maven-model
add 0022733 Added .asf.yaml to be ignored by apache-rat-plguin.
add b810f59 [MNG-6811] - Remove unnecessary filtering configuration
add f7ca74d [MNG-6812] - Remove unused files from maven-embedder
add 2c8f927 Added label apache-maven
add 25ced83 [MNG-6813] - Remove Maven 1 leftover
add 610e623 [MNG-6814] - Remove useless exclusion in maven-plugin-api
add 13c80d5 [MNG-6815] - Upgrade guice 4.2.2
add 7284bd6 Updated README.md
add 5750857 [MNG-6817] - Upgrade mockito to 3.2.0
add 11664b6 [MNG-6818] - Upgrade plexus-utils 3.3.0
add 3332f4d [MNG-6816] Prefer System.lineSeparator() over system
properties
new ee8e8e2 Merge remote-tracking branch 'remotes/origin/master' into
MNG-6656
new d373d3a MNG-6656: Keep xml version + encoding after transformation
new d9cc0e4 [MNG-6656] Improve ModelValidator
add 99953a4 [MNG-6820] - Remove unnecessary dependency exclusions for
commons-cli
add e7654f6 [MNG-6821] - Remove unnecessary dependency exclusions for
plexus-component-annotations
add b8f066e [MNG-6823] - Remove unnecessary dependency exclusions for
wagon-http
add 06842d6 [MNG-6826] - Remove condition check for JDK8+ in
FileSizeFormatTest - The conditions to check for JDK8+ in test cases is
obsolete with the lift to JDK8.
add 78ad10d [MNG-6807] - Remove LifecycleXpp3ReaderTest
add 370570b Fixed display text for Apache License.
add aad48b7 Removed duplication of License part.
add 11b8b2d [MNG-6824] ModelMerger is broken Fix modules Apply Java 8
Functions
new 9049d68 Merge branch 'master' into MNG-6656
add 1ad7801 [MNG-6827] Replace deprecated StringUtils#defaultString()
from Plexus Utils
add e3aa406 [MNG-6824] ModelMerger is broken Fixing reportSet.reports,
mailingList.otherArchives, contributor.roles, build.filters, execution.goals,
patternSet.includes, patternSet.excludes
new 630c22f Merge branch 'master' into MNG-6656
new 3d453bf [MNG-6656] Introduce custom ModelMerger to keep
inputLocationTracker from fileModel in rawModel
The 6 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:
.asf.yaml | 9 +
README.md | 10 +-
.../AbstractArtifactResolutionException.java | 2 +-
.../project/validation/ModelValidationResult.java | 6 +-
.../resolver/ArtifactResolutionExceptionTest.java | 2 +-
.../maven/artifact/testutils/TestFileManager.java | 3 +-
.../DefaultRepositorySystemSessionFactory.java | 82 +++-
.../plugin/DefaultLifecycleBindingsInjector.java | 6 +-
.../DefaultPluginDependenciesResolver.java | 11 +-
.../DefaultProjectDependenciesResolver.java | 11 +-
.../PluginParameterExpressionEvaluatorTest.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 2 +
.../building/DefaultToolchainsBuilderTest.java | 2 +-
.../building/ToolchainsBuildingExceptionTest.java | 2 +-
maven-embedder/pom.xml | 88 ++---
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 2 +-
.../src/test/embedder-test-project/pom.xml | 48 ---
.../src/main/java/org/apache/maven/App.java | 13 -
.../src/test/java/org/apache/maven/AppTest.java | 38 --
.../aggregate-mojo-failure/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/TestPlugin.java | 36 --
.../aggregate-mojo-failure/project/pom.xml | 25 --
.../bad-build-plan/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/TestPlugin.java | 35 --
.../bad-build-plan/project/pom.xml | 25 --
.../bad-dep-version/pom.xml | 33 --
.../test-maven-ext/1/test-maven-ext-1.pom | 34 --
.../bad-ext-direct-deps/project/pom.xml | 35 --
.../1/bad-ext-plugin-dep-ver-maven-plugin-1.jar | Bin 3166 -> 0 bytes
.../1/bad-ext-plugin-dep-ver-maven-plugin-1.pom | 55 ---
.../bad-ext-plugin-dep-ver/plugin/pom.xml | 57 ---
.../src/main/java/org/plugin/TestPlugin.java | 33 --
.../bad-ext-plugin-dep-ver/project/pom.xml | 37 --
.../1/bad-ext-plugin-maven-ver-maven-plugin-1.jar | Bin 3166 -> 0 bytes
.../1/bad-ext-plugin-maven-ver-maven-plugin-1.pom | 54 ---
.../maven-metadata-local.xml | 12 -
.../bad-ext-plugin-maven-ver/plugin/pom.xml | 57 ---
.../src/main/java/org/plugin/TestPlugin.java | 33 --
.../bad-ext-plugin-maven-ver/project/pom.xml | 37 --
.../bad-maven-version/pom.xml | 11 -
.../bad-mg-dep-version/pom.xml | 35 --
.../bad-non-dep-version/pom.xml | 35 --
.../bad-profile-repo/pom.xml | 7 -
.../bad-profile-repo/profiles.xml | 18 -
.../config-rdonly-mojo-param/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/TestPlugin.java | 39 --
.../config-rdonly-mojo-param/project/pom.xml | 47 ---
.../deploy-repo-creation-err/pom.xml | 41 --
.../duplicated-attachments/plugin/pom.xml | 54 ---
.../src/main/java/org/plugin/TestPlugin.java | 50 ---
.../duplicated-attachments/project/pom.xml | 25 --
.../1/err-loading-plugin-maven-plugin-1.jar | Bin 3166 -> 0 bytes
.../1/err-loading-plugin-maven-plugin-1.pom | 55 ---
.../err-loading-plugin/project/pom.xml | 45 ---
.../org/apache/maven/errortest/dep/1/dep-1.pom | 16 -
.../1/err-resolving-ext-plugin-maven-plugin-1.jar | Bin 3166 -> 0 bytes
.../1/err-resolving-ext-plugin-maven-plugin-1.pom | 60 ---
.../err-resolving-ext-plugin/project/pom.xml | 18 -
.../org/apache/maven/errortest/dep/1/dep-1.pom | 16 -
.../err-resolving-project-dep/project/pom.xml | 27 --
.../apache/maven/test/error/mojoFailure/App.java | 13 -
.../maven/test/error/mojoFailure/AppTest.java | 38 --
.../test-maven-ext-dep/1/test-maven-ext-dep-1.pom | 26 --
.../test-maven-ext/1/test-maven-ext-1.pom | 34 --
.../ext-deps-resolve-err/project/pom.xml | 35 --
.../ext-plugin-artifact-missing-maven-plugin-1.pom | 55 ---
.../ext-plugin-artifact-missing/project/pom.xml | 37 --
.../ext-plugin-realm-error/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/ComponentOne.java | 8 -
.../src/main/java/org/plugin/ComponentTwo.java | 8 -
.../src/main/java/org/plugin/TestPlugin.java | 39 --
.../main/resources/META-INF/plexus/components.xml | 25 --
.../ext-plugin-realm-error/project/pom.xml | 36 --
.../1/ext-plugin-version-err-maven-plugin-1.jar | Bin 3166 -> 0 bytes
.../1/ext-plugin-version-err-maven-plugin-1.pom | 50 ---
.../maven-metadata-local.xml | 10 -
.../ext-plugin-version-err/plugin/pom.xml | 57 ---
.../src/main/java/org/plugin/TestPlugin.java | 33 --
.../ext-plugin-version-err/project/pom.xml | 36 --
.../ext-realm-error/ext/pom.xml | 38 --
.../ext/src/main/java/org/ext/App.java | 13 -
.../main/resources/META-INF/plexus/components.xml | 1 -
.../ext-realm-error/project/pom.xml | 35 --
.../interp-from-model/pom.xml | 7 -
.../local-repo/org/test/bad-pom/1/bad-pom-1.pom | 9 -
.../interp-from-project/project/pom.xml | 22 --
.../load-extern-profiles-ioex/pom.xml | 7 -
.../load-extern-profiles-xex/pom.xml | 7 -
.../load-extern-profiles-xex/profiles.xml | 4 -
.../missing-direct-invoke-mojo/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/TestPlugin.java | 36 --
.../missing-module-pom/child1/pom.xml | 19 -
.../child1/src/main/java/org/test/App.java | 13 -
.../child1/src/test/java/org/test/AppTest.java | 38 --
.../missing-module-pom/pom.xml | 13 -
.../missing-parent-pom/pom.xml | 11 -
.../missing-req-mojo-param/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/TestPlugin.java | 38 --
.../missing-req-mojo-param/project/pom.xml | 25 --
.../mojo-config-error/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/TestPlugin.java | 33 --
.../src/main/resources/META-INF/maven/plugin.xml | 38 --
.../mojo-config-error/project/pom.xml | 45 ---
.../mojo-exec-err/plugin/pom.xml | 49 ---
.../src/main/java/org/plugin/TestPlugin.java | 33 --
.../mojo-exec-err/project/pom.xml | 26 --
.../mojo-lookup-err/plugin/pom.xml | 54 ---
.../src/main/java/org/plugin/TestPlugin.java | 42 --
.../mojo-lookup-err/project/pom.xml | 25 --
.../parent-parse-ioex/child/pom.xml | 10 -
.../parent-parse-ioex/pom.xml | 0
.../parent-parse-xex/child/pom.xml | 10 -
.../parent-parse-xex/pom.xml | 7 -
.../profile-activator-err/pom.xml | 39 --
.../profile-activator-lookup-err/ext/pom.xml | 38 --
.../ext/src/main/java/org/ext/App.java | 13 -
.../main/resources/META-INF/plexus/components.xml | 16 -
.../profile-activator-lookup-err/project/pom.xml | 46 ---
.../project-collision/mod1/pom.xml | 7 -
.../project-collision/mod2/pom.xml | 7 -
.../project-collision/pom.xml | 12 -
.../project-cycle/dep/pom.xml | 12 -
.../error-reporting-projects/project-cycle/pom.xml | 19 -
.../project-dep-missing/pom.xml | 22 --
.../apache/maven/test/error/mojoFailure/App.java | 13 -
.../maven/test/error/mojoFailure/AppTest.java | 38 --
.../project-mojo-failure/pom.xml | 17 -
.../apache/maven/test/error/mojoFailure/App.java | 14 -
.../maven/test/error/mojoFailure/AppTest.java | 38 --
.../project-parse-xex/pom.xml | 25 --
.../project-validation/pom.xml | 13 -
.../repo-creation-err/pom.xml | 41 --
.../test/eventing-projects/read-with-deps/pom.xml | 15 -
.../read-with-deps/repo/tests/dep/1/dep-1.pom | 6 -
.../eventing-projects/simple-read-project/pom.xml | 6 -
.../test/extensions/META-INF/plexus/components.xml | 28 --
.../maven/cli/CLIManagerDocumentationTest.java | 2 +-
.../maven/cli/transfer/FileSizeFormatTest.java | 21 +-
.../src/test/plugin-version-references/jar-pom.xml | 32 --
.../plugin-version-references/maven-plugin-pom.xml | 36 --
.../bad-module-non-recursive/badmodule/pom.xml | 14 -
.../bad-module-non-recursive/goodmodule/pom.xml | 14 -
.../test/projects/bad-module-non-recursive/pom.xml | 14 -
.../src/test/projects/invalid-goal/pom.xml | 49 ---
.../project/pom.xml | 13 -
.../src/main/java/org/codehaus/m2eclipse/App.java | 13 -
.../test/java/org/codehaus/m2eclipse/AppTest.java | 38 --
.../parent/1.0-SNAPSHOT/maven-metadata-company.xml | 11 -
.../parent/1.0-SNAPSHOT/parent-1.0-SNAPSHOT.pom | 18 -
.../m2eclipse/parent/maven-metadata-local.xml | 11 -
.../settings.xml | 23 --
.../src/test/projects/optional-dep/pom.xml | 20 -
.../readProject-missingModuleIgnored/pom.xml | 13 -
.../modules/child1/pom.xml | 13 -
.../readProject-withScmInheritance/pom.xml | 19 -
.../org.apache.maven/maven-core/pom.properties | 18 -
.../resources/pom-with-distribution-status.xml | 30 --
.../test/resources/pom-without-dependencies.xml | 30 --
maven-embedder/src/test/resources/pom.xml | 34 --
maven-embedder/src/test/resources/pom2.xml | 48 ---
.../test/resources/settings/invalid-settings.xml | 24 --
.../src/test/resources/settings/valid-settings.xml | 27 --
.../maven/model/building/DefaultModelBuilder.java | 196 +++++++++-
.../model/building/DefaultModelBuilderFactory.java | 1 +
.../building/DefaultModelBuildingRequest.java | 14 +
.../model/building/FilterModelBuildingRequest.java | 13 +
.../maven/model/building/ModelBuildingRequest.java | 15 +
.../inheritance/DefaultInheritanceAssembler.java | 8 +-
.../DefaultDependencyManagementInjector.java | 4 +-
.../DefaultPluginManagementInjector.java | 8 +-
.../apache/maven/model/merge/MavenModelMerger.java | 48 +--
.../model/profile/DefaultProfileInjector.java | 16 +-
.../model/validation/DefaultModelValidator.java | 51 +--
.../maven/model/validation/ModelValidator.java | 16 +-
maven-model-builder/src/main/mdo/profiles.mdo | 399 -------------------
.../model/building/FileToRawModelMergerTest.java | 82 ++++
.../validation/DefaultModelValidatorTest.java | 33 +-
maven-model/pom.xml | 58 +--
.../org/apache/maven/model/merge/ModelMerger.java | 408 +++++--------------
.../apache/maven/model/merge/ModelMergerTest.java | 430 +++++++++++++++++++++
maven-plugin-api/pom.xml | 6 -
.../plugin/lifecycle/LifecycleXpp3ReaderTest.java | 55 ---
maven-plugin-api/src/test/resources/lifecycle.xml | 39 --
pom.xml | 33 +-
185 files changed, 1107 insertions(+), 5025 deletions(-)
create mode 100644 .asf.yaml
delete mode 100644 maven-embedder/src/test/embedder-test-project/pom.xml
delete mode 100644
maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java
delete mode 100644
maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-build-plan/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-build-plan/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-build-plan/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.jar
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.jar
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/maven-metadata-local.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/bad-profile-repo/profiles.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/duplicated-attachments/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.jar
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.jar
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/java/org/plugin/ComponentOne.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/java/org/plugin/ComponentTwo.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.jar
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/maven-metadata-local.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/resources/META-INF/plexus/components.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/interp-from-model/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/interp-from-project/project/local-repo/org/test/bad-pom/1/bad-pom-1.pom
delete mode 100644
maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/profiles.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-direct-invoke-mojo/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-direct-invoke-mojo/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-module-pom/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/resources/META-INF/maven/plugin.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/resources/META-INF/plexus/components.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-mojo-failure/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-parse-xex/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/project-validation/pom.xml
delete mode 100644
maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml
delete mode 100644
maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml
delete mode 100644
maven-embedder/src/test/eventing-projects/read-with-deps/repo/tests/dep/1/dep-1.pom
delete mode 100644
maven-embedder/src/test/eventing-projects/simple-read-project/pom.xml
delete mode 100644
maven-embedder/src/test/extensions/META-INF/plexus/components.xml
delete mode 100644
maven-embedder/src/test/plugin-version-references/jar-pom.xml
delete mode 100644
maven-embedder/src/test/plugin-version-references/maven-plugin-pom.xml
delete mode 100644
maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
delete mode 100644
maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
delete mode 100644
maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
delete mode 100644 maven-embedder/src/test/projects/invalid-goal/pom.xml
delete mode 100644
maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/pom.xml
delete mode 100644
maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java
delete mode 100644
maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
delete mode 100644
maven-embedder/src/test/projects/isolated-project-getting-parent-pom/repository/org/codehaus/m2eclipse/parent/1.0-SNAPSHOT/maven-metadata-company.xml
delete mode 100644
maven-embedder/src/test/projects/isolated-project-getting-parent-pom/repository/org/codehaus/m2eclipse/parent/1.0-SNAPSHOT/parent-1.0-SNAPSHOT.pom
delete mode 100644
maven-embedder/src/test/projects/isolated-project-getting-parent-pom/repository/org/codehaus/m2eclipse/parent/maven-metadata-local.xml
delete mode 100644
maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml
delete mode 100644 maven-embedder/src/test/projects/optional-dep/pom.xml
delete mode 100644
maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml
delete mode 100644
maven-embedder/src/test/projects/readProject-withScmInheritance/modules/child1/pom.xml
delete mode 100644
maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml
delete mode 100644
maven-embedder/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
delete mode 100644
maven-embedder/src/test/resources/pom-with-distribution-status.xml
delete mode 100644
maven-embedder/src/test/resources/pom-without-dependencies.xml
delete mode 100644 maven-embedder/src/test/resources/pom.xml
delete mode 100644 maven-embedder/src/test/resources/pom2.xml
delete mode 100644
maven-embedder/src/test/resources/settings/invalid-settings.xml
delete mode 100644
maven-embedder/src/test/resources/settings/valid-settings.xml
delete mode 100644 maven-model-builder/src/main/mdo/profiles.mdo
create mode 100644
maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
create mode 100644
maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
delete mode 100644
maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
delete mode 100644 maven-plugin-api/src/test/resources/lifecycle.xml
