[MNG-7407] Introduce a ModelVersionProcessor component to make CI Friends Versions pluggable #675
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 tasks
|
Please rebase |
Done! |
michael-o
reviewed
Feb 13, 2022
...src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
Outdated
Show resolved
Hide resolved
michael-o
requested changes
Feb 13, 2022
...src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
Show resolved
Hide resolved
maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Outdated
Show resolved
Hide resolved
Friends Versions pluggable
michael-o
reviewed
Feb 13, 2022
| } | ||
|
|
||
| StringSearchModelInterpolator() | ||
| { | ||
| super( null, null ); | ||
| super( null, null, null ); |
There was a problem hiding this comment.
@cstamas Can you come up with a reason why we have this?
There was a problem hiding this comment.
I think that was for test only but is no longer used, should I remove that?
michael-o
reviewed
Feb 13, 2022
|
So I have good and bad news. This change revealed a really really ugly bug in Maven. I will share details tomorrow and need to discuss this with @rfscholte. Good news: The bug can be worked around for your PR. |
Anything I could do in the meantime to mitigate this? |
Just need a bit of time. It is almost complete on my side. |
asfgit
pushed a commit
that referenced
this pull request
Feb 19, 2022
…endly Versions pluggable This closes #675
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the handling for https://maven.apache.org/maven-ci-friendly.html is hard wired into maven.
For Tycho we like to replace/extend the default handling for this to supply the user with some automatic derived values for some of the variables.
This PR extracts the parts of that handling in a new ModelVersionProcessor that has the current behavior as a default implemented. This not only makes it more clear how this is handled (no cross references between DefaultModelValidator and AbstractStringBasedModelInterpolator required) but also allows to override the handling by a core extension.
FYI @mickaelistria @akurtakov
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 replaceMNG-XXXand
SUMMARYwith the appropriate JIRA issue. Best practice is to use the JIRA issuetitle in 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.