You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/10/21 20:12:49 UTC

[maven] 01/07: Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven

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 8913502589acbbd51f5403666c239633c5e06f2d
Merge: 789d75f 42af8ba
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Oct 21 21:25:41 2020 +0200

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven

 .../apache/maven/graph/DefaultGraphBuilder.java    | 162 +++++++-------
 .../project/DefaultModelBuildingListener.java      |   2 +-
 .../collector/DefaultProjectsCollector.java        |  98 +++++++++
 .../collector/MultiModuleCollectionStrategy.java   | 195 +++++++++++++++++
 .../collector/PomlessCollectionStrategy.java       |  67 ++++++
 .../collector/ProjectCollectionStrategy.java       |  41 ++++
 .../maven/project/collector/ProjectsCollector.java |  43 ++++
 .../collector/RequestPomCollectionStrategy.java    |  57 +++++
 .../maven/AbstractCoreMavenComponentTestCase.java  |   5 +
 .../maven/graph/DefaultGraphBuilderTest.java       | 236 +++++++++++++--------
 .../apache/maven/monitor/logging/DefaultLog.java   |   5 +-
 .../java/org/apache/maven/plugin/AbstractMojo.java |  10 +-
 .../main/java/org/apache/maven/plugin/Mojo.java    |   9 +-
 .../java/org/apache/maven/plugin/logging/Log.java  |   5 +-
 .../maven/plugin/logging/SystemStreamLog.java      |   5 +-
 .../src/main/mdo/metadata.mdo                      |   2 +-
 16 files changed, 770 insertions(+), 172 deletions(-)