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 2019/09/10 19:57:18 UTC
[maven] 01/02: Merge branch 'master' into MNG-6656
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 2f4d4919f590007de2fe6a13b76cffa1f54e3809
Merge: 712b95f 38efe84
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Sep 10 21:51:53 2019 +0200
Merge branch 'master' into MNG-6656
apache-maven/pom.xml | 2 +-
doap_Maven.rdf | 11 +-
maven-artifact/pom.xml | 2 +-
.../maven/artifact/versioning/VersionRange.java | 10 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../artifact/resolver/DebugResolutionListener.java | 3 +-
maven-core/pom.xml | 2 +-
.../repository/MavenArtifactRepository.java | 3 +-
.../resolver/filter/ExclusionArtifactFilter.java | 14 +-
.../resolver/filter/ScopeArtifactFilter.java | 9 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 2 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 14 +-
.../org/apache/maven/project/MavenProject.java | 11 +-
.../artifact/DefaultMavenMetadataCache.java | 25 +-
.../apache/maven/toolchain/DefaultToolchain.java | 10 +-
.../filter/ExclusionArtifactFilterTest.java | 33 +
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 12 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
.../org/apache/maven/model/merge/ModelMerger.java | 866 ++++++++++-----------
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 2 +-
29 files changed, 530 insertions(+), 523 deletions(-)