This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MNG-6656 in repository https://gitbox.apache.org/repos/asf/maven.git
commit ee8e8e27a6c9cdda5339f0ae0c973a1e9afbe4d1 Merge: 21be0b1 3332f4d Author: rfscholte <[email protected]> AuthorDate: Tue Dec 10 21:59:30 2019 +0100 Merge remote-tracking branch 'remotes/origin/master' into MNG-6656 .asf.yaml | 9 + README.md | 4 +- .../AbstractArtifactResolutionException.java | 2 +- .../project/validation/ModelValidationResult.java | 6 +- .../resolver/ArtifactResolutionExceptionTest.java | 2 +- .../PluginParameterExpressionEvaluatorTest.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 +- .../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-builder/src/main/mdo/profiles.mdo | 399 --------------------- maven-model/pom.xml | 53 --- maven-plugin-api/pom.xml | 6 - pom.xml | 7 +- 160 files changed, 61 insertions(+), 4461 deletions(-)
