This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch revert-MNG-6772 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1b0d56bc0d3e7feb6f036958a2f371ea42dffa2e Author: Michael Osipov <micha...@apache.org> AuthorDate: Sat Jan 23 20:00:24 2021 +0100 Revert "[MNG-6772] Prevent Super POM central entry from overriding" This reverts commit 2a23d7bf16612ff1868941669bde3a7d323a93e2. --- .../src/main/java/org/apache/maven/project/ProjectModelResolver.java | 2 +- .../java/org/apache/maven/repository/internal/DefaultModelResolver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java index ae44924..4309463 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java @@ -110,7 +110,7 @@ public class ProjectModelResolver this.externalRepositories = original.externalRepositories; this.repositories = new ArrayList<>( original.repositories ); this.repositoryMerging = original.repositoryMerging; - this.repositoryIds = new HashSet<>(); + this.repositoryIds = new HashSet<>( original.repositoryIds ); this.modelPool = original.modelPool; } diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java index 0819477..93f6676 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java @@ -99,7 +99,7 @@ class DefaultModelResolver this.versionRangeResolver = original.versionRangeResolver; this.remoteRepositoryManager = original.remoteRepositoryManager; this.repositories = new ArrayList<>( original.repositories ); - this.repositoryIds = new HashSet<>(); + this.repositoryIds = new HashSet<>( original.repositoryIds ); } @Override