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

Avoid double profile injection

This commit is contained in:
Guillaume Nodet 2024-10-16 22:22:44 +02:00
parent 4da2eb9622
commit 107f81da51
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
View File

@ -1132,12 +1132,13 @@ public class DefaultModelBuilder implements ModelBuilder {
throw newModelBuilderException();
}
inputModel = activateFileModel(inputModel);
setRootModel(inputModel);
Model activatedFileModel = activateFileModel(inputModel);
// profile activation
DefaultProfileActivationContext profileActivationContext = getProfileActivationContext(request, inputModel);
DefaultProfileActivationContext profileActivationContext =
getProfileActivationContext(request, activatedFileModel);
List<Profile> activeExternalProfiles = result.getActiveExternalProfiles();
@ -1150,7 +1151,7 @@ public class DefaultModelBuilder implements ModelBuilder {
profileActivationContext.setUserProperties(profileProps);
}
Model parentModel = readParent(inputModel);
Model parentModel = readParent(activatedFileModel);
// Now that we have read the parent, we can set the relative
// path correctly if it was not set in the input model
if (inputModel.getParent() != null && inputModel.getParent().getRelativePath() == null) {