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 2020/12/26 13:27:21 UTC
[maven] branch MNG-4645+MNG-6772 created (now 5af47ae)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-4645+MNG-6772
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 5af47ae Revert "[MNG-6772] Prevent Super POM central entry from overriding"
This branch includes the following new commits:
new 5af47ae Revert "[MNG-6772] Prevent Super POM central entry from overriding"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: Revert "[MNG-6772] Prevent Super POM central entry
from overriding"
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-4645+MNG-6772
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 5af47aecb6e6f90091298675eef95383fa92f065
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Dec 25 19:58:43 2020 +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