Skip to content

Fix ConditionParser to handle newlines before && operator #12038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blaspat wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix ConditionParser to handle newlines before && operator #12038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4022c80
Fix ConditionParser to handle newlines before && operator
blaspat May 12, 2026
ad0aa49
Update impl/maven-impl/src/main/java/org/apache/maven/impl/model/prof…
blaspat May 15, 2026
c39393d
Update impl/maven-impl/src/main/java/org/apache/maven/impl/model/prof…
blaspat May 15, 2026
f64ecb7
Update impl/maven-impl/src/test/java/org/apache/maven/impl/model/prof…
blaspat May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,21 @@ private List<String> tokenize(String expression) {
}
quoteType = c;
sb.append(c);
} else if (c == ' ' || c == '(' || c == ')' || c == ',' || c == '+' || c == '>' || c == '<' || c == '='
|| c == '!') {
} else if (Character.isWhitespace(c) || c == '(' || c == ')' || c == ',' || c == '+'
|| c == '>' || c == '<' || c == '=' || c == '!' || c == '&' || c == '|') {
if (!sb.isEmpty()) {
tokens.add(sb.toString());
sb.setLength(0);
}
if (c != ' ') {
if ((c == '>' || c == '<' || c == '=' || c == '!')
if (!Character.isWhitespace(c)) {
if ((c == '>' || c == '<' || c == '=' || c == '!' || c == '&')
&& i + 1 < expression.length()
&& expression.charAt(i + 1) == '=') {
tokens.add(c + "=");
i++; // Skip the next character
} else if (c == '&' && i + 1 < expression.length() && expression.charAt(i + 1) == '&') {
tokens.add("&&");
i++; // Skip the next character
Comment on lines +139 to +146
Copy link
Copy Markdown
Contributor

@gnodet gnodet May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two issues:

  1. & in the X= group: & was added to the >=/<=/==/!= lookahead, which means &= would be tokenized as a valid two-char operator. But &= is not valid in this language — remove || c == '&' from this condition.

  2. || not handled: The || operator has the exact same tokenization gap that && had. The | character is not in the operator list, so || only works when surrounded by spaces. Handle it symmetrically with &&.

Suggested change
if ((c == '>' || c == '<' || c == '=' || c == '!' || c == '&')
&& i + 1 < expression.length()
&& expression.charAt(i + 1) == '=') {
tokens.add(c + "=");
i++; // Skip the next character
} else if (c == '&' && i + 1 < expression.length() && expression.charAt(i + 1) == '&') {
tokens.add("&&");
i++; // Skip the next character
if ((c == '>' || c == '<' || c == '=' || c == '!')
&& i + 1 < expression.length()
&& expression.charAt(i + 1) == '=') {
tokens.add(c + "=");
i++; // Skip the next character
} else if (c == '&' && i + 1 < expression.length() && expression.charAt(i + 1) == '&') {
tokens.add("&&");
i++; // Skip the next character
} else if (c == '|' && i + 1 < expression.length() && expression.charAt(i + 1) == '|') {
tokens.add("||");
i++; // Skip the next character

Please also add corresponding test cases for || with newlines, similar to the && tests.

} else {
tokens.add(String.valueOf(c));
}
Expand Down
25 changes: 25 additions & 0 deletions impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,31 @@ void testPropertyAlias() {
assertThrows(RuntimeException.class, () -> parser.parse("${unclosed"));
}

@Test
void testAmpersandAmpersandTokenizerMultiline() {
// Regression test for https://github.com/apache/maven/issues/11882
// The && operator was not being tokenized correctly when a line break appeared before it.
// Uses ${os.name} and ${os.arch} which are set to 'windows' and 'amd64' in the mock context.

// Case 1: Basic && without line breaks (baseline - always worked)
assertTrue((Boolean) parser.parse("${os.arch} == 'amd64' && ${os.name} == 'windows'"));

// Case 2: Line break BEFORE && - this was the bug from issue #11882
// In the issue, CDATA content had a line break before &&:
// <condition><![CDATA[exists( '.profile-2' )\n&& missing( '.profile-1' )]]></condition>
assertTrue((Boolean) parser.parse("${os.arch} == 'amd64'\n&& ${os.name} == 'windows'"));

// Case 3: Line break AFTER &&
assertTrue((Boolean) parser.parse("${os.arch} == 'amd64' &&\n${os.name} == 'windows'"));

// Case 4: Line breaks on both sides
assertTrue((Boolean) parser.parse("${os.arch} == 'amd64'\n&&\n${os.name} == 'windows'"));

// Case 5: Multiple && with line break before first && (like bad-profile-2d in issue)
assertTrue(
(Boolean) parser.parse("${os.arch} == 'amd64'\n&& ${os.name} == 'windows' && ${os.name} == 'windows'"));
}

@Test
void testNestedPropertyAlias() {
functions.put("property", args -> {
Copy link
Copy Markdown
Contributor

@gnodet gnodet May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add a test for || with newlines, similar to testAmpersandAmpersandTokenizerMultiline. For example:

@Test
void testPipePipeTokenizerMultiline() {
    // || with newlines should work the same as &&
    assertTrue((Boolean) parser.parse("${os.arch} == 'amd64' || ${os.name} == 'linux'"));
    assertTrue((Boolean) parser.parse("${os.arch} == 'amd64'\n|| ${os.name} == 'linux'"));
    assertTrue((Boolean) parser.parse("${os.arch} == 'amd64' ||\n${os.name} == 'linux'"));
    assertTrue((Boolean) parser.parse("${os.arch} == 'amd64'\n||\n${os.name} == 'linux'"));
}

Expand Down