This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MNG-6999 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 789d75fc68365e0a1281a3532a07e2e744a76b30 Merge: f211600 7c7de41 Author: rfscholte <[email protected]> AuthorDate: Fri Oct 16 20:34:10 2020 +0200 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven .github/workflows/maven.yml | 17 +- Jenkinsfile | 14 +- README.md | 20 +- apache-maven/README.txt | 2 +- ...f4j-api-1.7.29.txt => MIT-slf4j-api-1.7.30.txt} | 2 +- .../execution/DefaultMavenExecutionRequest.java | 6 +- .../lifecycle/internal/BuildThreadFactory.java | 4 +- .../DefaultPluginDependenciesResolver.java | 12 +- .../maven/plugin/internal/PlexusUtilsInjector.java | 87 ---- .../project/DefaultProjectBuildingHelper.java | 5 +- .../apache/maven/project/ProjectModelResolver.java | 2 +- .../main/resources/META-INF/maven/extension.xml | 1 + .../apache/maven/project/ProjectBuilderTest.java | 14 + .../project-builder/MNG-6983/parent-pom.xml | 38 ++ .../test/projects/project-builder/MNG-6983/pom.xml | 22 + .../main/java/org/apache/maven/cli/MavenCli.java | 492 ++++++++++++--------- .../java/org/apache/maven/cli/MavenCliTest.java | 91 +++- maven-model/src/main/mdo/maven.mdo | 16 +- .../repository/internal/DefaultModelResolver.java | 2 +- maven-wrapper/pom.xml | 2 +- pom.xml | 6 +- 21 files changed, 505 insertions(+), 350 deletions(-) diff --cc maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java index 5493d89,7cd3758..bb9e58b --- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java @@@ -35,7 -34,9 +35,8 @@@ import java.util.List import java.util.Properties; import org.apache.maven.AbstractCoreMavenComponentTestCase; -import org.apache.maven.artifact.InvalidArtifactRTException; import org.apache.maven.execution.MavenSession; + import org.apache.maven.model.Plugin; import org.apache.maven.model.building.FileModelSource; import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.building.ModelSource;
