Skip to content

[MNG-8349] Avoid exceptions with invalid modelVersion #1848

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

Merged
merged 1 commit into from
Oct 24, 2024
Merged

[MNG-8349] Avoid exceptions with invalid modelVersion #1848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 2 deletions maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,15 +1963,22 @@ private static int compareModelVersions(String first, String second) {
String[] firstSegments = first.split("\\.");
String[] secondSegments = second.split("\\.");
for (int i = 0; i < Math.max(firstSegments.length, secondSegments.length); i++) {
int result = Long.valueOf(i < firstSegments.length ? firstSegments[i] : "0")
.compareTo(Long.valueOf(i < secondSegments.length ? secondSegments[i] : "0"));
int result = asLong(i, firstSegments).compareTo(asLong(i, secondSegments));
if (result != 0) {
return result;
}
}
return 0;
}

private static Long asLong(int index, String[] segments) {
try {
return Long.valueOf(index < segments.length ? segments[index] : "0");
} catch (NumberFormatException e) {
return 0L;
}
}

@SuppressWarnings("checkstyle:parameternumber")
private boolean validateBannedCharacters(
String prefix,
Expand Down