Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7634] Revert MNG-5982 and MNG-7417 

This closes #916
This commit is contained in:
Michael Osipov 2022-12-17 20:48:42 +01:00
parent 29e7b0ea3c
commit 968c1a25f5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
View File

@ -194,8 +194,11 @@ private Model loadPom(
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 @@ private Model loadPom(
}
}
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;
}