[MNG-8081] interpolate available properties during default profile selection (Maven 3.9.x) #1447
Conversation
mbenson
force-pushed
the
mng-5235@39x
branch
2 times, most recently
from
f36d41c
to
4c93af5
Compare
| @Inject | ||
| private List<ProfileActivator> activators = new ArrayList<>(); | ||
|
|
||
| @Inject | ||
| private ModelInterpolator interpolator = new ModelInterpolator() { |
| }; | ||
| model.setProfiles(original.stream().map(activatableProfile).collect(Collectors.toList())); | ||
|
|
||
| ModelBuildingRequest mbr = new DefaultModelBuildingRequest() |
There was a problem hiding this comment.
guess it would be saner to use the actual loaded model we already have at that time and avoid asProperties too since request is already there
can be done in DefaultModelBuilder probably
side note: we must somehow align it on master and not create a behavior in v3 which is different from v4 so for me ensuring v4 behavior (merge) and impl alignment is a prerequisite to this PR.
| .interpolateModel(model, context.getProjectDirectory(), mbr, problem -> {}) | ||
| .getProfiles(); | ||
|
|
||
| return model.getProfiles().stream().collect(Collectors.toMap(Profile::getId, UnaryOperator.identity())); |
There was a problem hiding this comment.
identity belongs to Function IIRC
maven-model-builder/pom.xml
Outdated
| @@ -87,6 +87,11 @@ under the License. | |||
| <artifactId>xmlunit-matchers</artifactId> | |||
| <scope>test</scope> | |||
| </dependency> | |||
| <dependency> | |||
There was a problem hiding this comment.
🙏 why mocking there? this is a hell anywhere in maven code base and ultimately the related tests are useless in general so let's try to avoid it
mbenson
changed the title
There was a problem hiding this comment.
This is wrong imho, the interpolation should be done in the ModelBuilder during profile activation interpolation
|
Sounds like this approach would keep the v3/v4 impls more similar. I'll work on this. |
…lection (Maven 3.9.x)
Using the available
ModelInterpolator, evaluate profile activations after having interpolated any embedded property constructs among configurations of activations only.Following this checklist to help us incorporate your
contribution quickly and easily:
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
[MNG-XXX] SUMMARY,where you replace
MNG-XXXandSUMMARYwith the appropriate JIRA issue.[MNG-XXX] SUMMARY.Best practice is to use the JIRA issue title in both the pull request title and in the first line of the commit message.
mvn clean verifyto make sure basic checks pass. A more thorough check willbe performed on your pull request automatically.
If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.
I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004
In any other case, please file an Apache Individual Contributor License Agreement.
ICLA on file