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 2022/12/17 20:34:59 UTC
[maven] branch MNG-7634 created (now 2bbd88534)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7634
in repository https://gitbox.apache.org/repos/asf/maven.git
at 2bbd88534 [MNG-7634] Revert MNG-5982 and MNG-7417
This branch includes the following new commits:
new 2bbd88534 [MNG-7634] Revert MNG-5982 and MNG-7417
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-7634] Revert MNG-5982 and MNG-7417
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7634
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2bbd88534edc27c2f4932c46a6acfc701c9aa134
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Dec 17 20:48:42 2022 +0100
[MNG-7634] Revert MNG-5982 and MNG-7417
This closes #916
---
.../internal/DefaultArtifactDescriptorReader.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index ecbc14b52..b946ca84d 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -194,8 +194,11 @@ public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader
modelRequest.setValidationLevel(ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL);
modelRequest.setProcessPlugins(false);
modelRequest.setTwoPhaseBuilding(false);
- modelRequest.setSystemProperties(toProperties(session.getSystemProperties()));
- modelRequest.setUserProperties(toProperties(session.getUserProperties()));
+ // This merge is on purpose because otherwise user properties would override model
+ // properties in dependencies the user does not know. See MNG-7563 for details.
+ modelRequest.setSystemProperties(
+ toProperties(session.getUserProperties(), session.getSystemProperties()));
+ modelRequest.setUserProperties(new Properties());
modelRequest.setModelCache(modelCacheFactory.createCache(session));
modelRequest.setModelResolver(new DefaultModelResolver(
session,
@@ -248,9 +251,14 @@ public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader
}
}
- private Properties toProperties(Map<String, String> map) {
+ private Properties toProperties(Map<String, String> dominant, Map<String, String> recessive) {
Properties props = new Properties();
- props.putAll(map);
+ if (recessive != null) {
+ props.putAll(recessive);
+ }
+ if (dominant != null) {
+ props.putAll(dominant);
+ }
return props;
}