Backport #12038: Fix ConditionParser to handle newlines before && operator#12259
Merged
Conversation
* Fix ConditionParser to handle newlines before && operator Fix for apache#11882 The tokenize() method only treated space as whitespace, so newlines became standalone tokens. When a line break appeared before &&, the operator was parsed as two separate & tokens instead of one &&. Added \n, \r, \t to whitespace handling and properly tokenize && as a single operator token regardless of surrounding whitespace. Signed-off-by: Blasius Patrick <blasius.patrick@gmail.com> * Update impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionParser.java Co-authored-by: Guillaume Nodet <gnodet@gmail.com> * Update impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionParser.java Co-authored-by: Guillaume Nodet <gnodet@gmail.com> * Update impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionParserTest.java Co-authored-by: Guillaume Nodet <gnodet@gmail.com> * fix: handle || operator and remove & from X= lookahead Address review feedback from gnodet on PR apache#12038: - Remove c == '&' from the >=/<= /==/!= lookahead (&= is not valid) - Add || tokenization symmetrically with && - Add regression tests for || with line breaks Fixes apache#11882 Signed-off-by: Blasius Patrick <blasius.patrick@gmail.com> --------- Signed-off-by: Blasius Patrick <blasius.patrick@gmail.com> Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
Bukama
approved these changes
Jun 13, 2026
|
@gnodet Please assign appropriate label to PR according to the type of change. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport of #12038 to 4.0.x branch.