You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/03/28 22:02:00 UTC
[maven] branch MNG-6772 created (now 9ff0b24)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6772
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 9ff0b24 [MNG-6772] Prevent Super POM central entry from overriding
This branch includes the following new commits:
new 9ff0b24 [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: [MNG-6772] Prevent Super POM central entry from
overriding
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6772
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 9ff0b24722f6c87a481cee1770e77862e36e067d
Author: Eddie Wiegers <eg...@mst.edu>
AuthorDate: Thu Oct 3 14:24:26 2019 -0500
[MNG-6772] Prevent Super POM central entry from overriding
Closes #289
---
.../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 24b36dd..70abd97 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<>( original.repositoryIds );
+ this.repositoryIds = new HashSet<>();
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 f23bfe4..993d38e 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<>( original.repositoryIds );
+ this.repositoryIds = new HashSet<>();
}
@Override