You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/10/17 14:35:50 UTC
(maven) 03/03: Avoid double profile injection
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 107f81da514aedb92d92f6496406a7d15063bfc2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Oct 16 22:22:44 2024 +0200
Avoid double profile injection
---
.../apache/maven/internal/impl/model/DefaultModelBuilder.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
index bcb3d622c8..38266f3032 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
@@ -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) {