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/11/29 12:00:11 UTC
[maven] 01/02: Merge branch 'master' into MNG-6957
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2737305793de27363a25ba49797b949ea3cf4335
Merge: b6f0b12 3736be9
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Nov 28 15:15:20 2020 +0100
Merge branch 'master' into MNG-6957
apache-maven/maven-wrapper.pom | 2 +-
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../installer/DefaultArtifactInstaller.java | 1 +
.../transform/ReleaseArtifactTransformation.java | 1 +
.../resolver/transform/SnapshotTransformation.java | 1 +
maven-core/pom.xml | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +
.../metadata/AbstractRepositoryMetadata.java | 1 -
.../DefaultRepositorySystemSessionFactory.java | 11 +--
...Collector.java => DefaultProjectsSelector.java} | 15 ++--
.../collector/MultiModuleCollectionStrategy.java | 9 +-
.../collector/PomlessCollectionStrategy.java | 6 +-
...rojectsCollector.java => ProjectsSelector.java} | 10 +--
.../collector/RequestPomCollectionStrategy.java | 11 +--
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../resources/META-INF/plexus/default-bindings.xml | 100 +++++++++++----------
.../maven/graph/DefaultGraphBuilderTest.java | 10 +--
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
.../building/AbstractModelSourceTransformer.java | 12 ++-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../repository/internal/LocalSnapshotMetadata.java | 15 ++--
.../internal/LocalSnapshotMetadataGenerator.java | 7 +-
.../maven/repository/internal/MavenMetadata.java | 8 +-
.../repository/internal/MavenSnapshotMetadata.java | 5 +-
.../internal/RemoteSnapshotMetadata.java | 14 +--
.../internal/RemoteSnapshotMetadataGenerator.java | 9 +-
.../repository/internal/VersionsMetadata.java | 13 +--
.../internal/VersionsMetadataGenerator.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
maven-slf4j-wrapper/pom.xml | 2 +-
maven-wrapper/pom.xml | 2 +-
maven-xml/pom.xml | 2 +-
pom.xml | 2 +-
43 files changed, 170 insertions(+), 144 deletions(-)