You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/03/01 22:43:42 UTC
[maven] 02/02: Revert "[MNG-6772] Prevent Super POM central entry
from overriding"
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 1acea5b7eba19e7f58d28cc491d268bad3db6402
Author: Michael Osipov <mi...@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 b1b28ef..9caa3e6 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
@@ -111,7 +111,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 993d38e..f23bfe4 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
@@ -103,7 +103,7 @@ class DefaultModelResolver
this.remoteRepositoryManager = original.remoteRepositoryManager;
this.repositories = new ArrayList<>( original.repositories );
this.externalRepositories = original.externalRepositories;
- this.repositoryIds = new HashSet<>();
+ this.repositoryIds = new HashSet<>( original.repositoryIds );
}
@Override