Skip to content

feat: Improve the matching of required versions #11770

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
nielsbasjes wants to merge 4 commits into
base: maven-3.9.x
Choose a base branch
from
+63 −3
Open

feat: Improve the matching of required versions #11770

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
a8c0d5b
feat: Improve the matching of required versions
nielsbasjes Mar 9, 2026
f4fdc9b
fix: Compile regexes only once.
nielsbasjes Jul 26, 2026
8c439aa
fix: Regex bug not supporting multi digit major versions.
nielsbasjes Jul 26, 2026
3f34758
fix: Spotless layout changes
nielsbasjes Jul 26, 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
30 changes: 29 additions & 1 deletion maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.apache.maven.toolchain;

import java.util.regex.Pattern;

import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
Expand Down Expand Up @@ -66,7 +68,7 @@ private VersionMatcher(String version) {
@Override
public boolean matches(String requirement) {
try {
VersionRange range = VersionRange.createFromVersionSpec(requirement);
VersionRange range = convertRequirementToVersionRange(requirement);
if (range.hasRestrictions()) {
return range.containsVersion(version);
} else {
Expand All @@ -79,6 +81,32 @@ public boolean matches(String requirement) {
}
}

private static final Pattern PATTERN_MAJOR_VERSION = Pattern.compile("^[0-9]+$");
private static final Pattern PATTERN_MAJOR_MINOR_VERSION = Pattern.compile("^[0-9]+\\.[0-9]+$");

private VersionRange convertRequirementToVersionRange(String requirement)
throws InvalidVersionSpecificationException {
// Specific for Version _requirement_ matching;
// If the version is a simple integer (like "25")
// then treat this as the requirement "the major version is 25"
if (PATTERN_MAJOR_VERSION.matcher(requirement).matches()) {
int majorVersion = Integer.parseInt(requirement);
return VersionRange.createFromVersionSpec("[" + majorVersion + "," + (majorVersion + 1) + ")");
}

// If the version is a major.minor (like "1.5")
// then treat this as the requirement "the major version is 1 and the minor is 5"
if (PATTERN_MAJOR_MINOR_VERSION.matcher(requirement).matches()) {
String[] split = requirement.split("\\.", 2);
int majorVersion = Integer.parseInt(split[0]);
int minorVersion = Integer.parseInt(split[1]);
return VersionRange.createFromVersionSpec(
"[" + majorVersion + "." + minorVersion + "," + majorVersion + "." + (minorVersion + 1) + ")");
}

return VersionRange.createFromVersionSpec(requirement);
}

@Override
public String toString() {
return version.toString();
Expand Down
36 changes: 34 additions & 2 deletions maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,18 @@ public void testCreateExactMatcher() {
public void testCreateVersionMatcher() {
RequirementMatcher matcher;
matcher = RequirementMatcherFactory.createVersionMatcher("1.5.2");
assertFalse(matcher.matches("1.5"));
assertTrue(matcher.matches("1.5.2"));
assertTrue(matcher.matches("1")); // Major matches
assertTrue(matcher.matches("1.5")); // Major.Minor matches
assertTrue(matcher.matches("1.5.2")); // Full match

@gnodet gnodet Jul 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Consider adding test cases with multi-digit major versions to cover the regex bug above. For example:

matcher = RequirementMatcherFactory.createVersionMatcher("21.0.2");
assertTrue(matcher.matches("21"));    // Major-only
assertTrue(matcher.matches("21.0"));  // Major.minor
assertFalse(matcher.matches("17"));   // Wrong major

This would immediately expose the single-digit regex limitation.

assertFalse(matcher.matches("1.6")); // Wrong minor
assertFalse(matcher.matches("2")); // Wrong major
Comment thread
nielsbasjes marked this conversation as resolved.
assertFalse(matcher.matches("2.5")); // Wrong major, right minor
assertFalse(matcher.matches("[1.4,1.5)"));
assertFalse(matcher.matches("[1.5,1.5.2)"));
assertTrue(matcher.matches("[1.5,1.5.3)"));
assertTrue(matcher.matches("(1.5.1,1.6)"));
assertFalse(matcher.matches("(1.5.2,1.6)"));
assertTrue(matcher.matches("[1.5.2,1.6)"));
assertTrue(matcher.matches("(1.4,1.5.2]"));
assertTrue(matcher.matches("(1.5,)"));
assertEquals("1.5.2", matcher.toString());
Expand All @@ -63,4 +70,29 @@ public void testCreateVersionMatcher() {
matcher = RequirementMatcherFactory.createVersionMatcher("1.5");
assertEquals("1.5", matcher.toString());
}

@Test
public void testCreateVersionMatcherMultiDigit() {
RequirementMatcher matcher;
matcher = RequirementMatcherFactory.createVersionMatcher("11.55.22");
assertTrue(matcher.matches("11")); // Major matches
assertTrue(matcher.matches("11.55")); // Major.Minor matches
assertTrue(matcher.matches("11.55.22")); // Full match
assertFalse(matcher.matches("11.66")); // Wrong minor
assertFalse(matcher.matches("22")); // Wrong major
assertFalse(matcher.matches("22.55")); // Wrong major, right minor
assertFalse(matcher.matches("[11.54,11.55)"));
assertFalse(matcher.matches("[11.55,11.55.22)"));
assertTrue(matcher.matches("[11.55,11.55.33)"));
assertTrue(matcher.matches("(11.55.11,11.56)"));
assertFalse(matcher.matches("(11.55.22,11.56)"));
assertTrue(matcher.matches("[11.55.22,11.56)"));
assertTrue(matcher.matches("(11.54,11.55.22]"));
assertTrue(matcher.matches("(11.55,)"));
assertEquals("11.55.22", matcher.toString());

// Ensure it is not printed as 1.5.0
matcher = RequirementMatcherFactory.createVersionMatcher("11.55");
assertEquals("11.55", matcher.toString());
}
}
Loading