Skip to content

Fix version comparator: use numeric comparison with non-numeric segment support (#166) #179

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
elharo wants to merge 2 commits into
base: master
Choose a base branch
from
+141 −12
Open

Fix version comparator: use numeric comparison with non-numeric segment support (#166) #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d32c26
Fix version comparator: use numeric comparison with non-numeric segme…
elharo Jul 22, 2026
283472d
Address copilot review: long overflow, suffix-vs-suffix tiebreaker, a…
elharo Jul 22, 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
51 changes: 39 additions & 12 deletions src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,24 +370,51 @@ Comparator<ToolchainModel> version() {
String[] b = v2.split("\\.");
int length = Math.min(a.length, b.length);
for (int i = 0; i < length; i++) {
String oa = a[i];
String ob = b[i];
if (!Objects.equals(oa, ob)) {
// A null element is less than a non-null element
if (oa == null || ob == null) {
return oa == null ? -1 : 1;
}
int v = oa.compareTo(ob);
if (v != 0) {
return v;
}
int cmp = compareVersionSegments(a[i], b[i]);
if (cmp != 0) {
return cmp;
}
}
return a.length - b.length;
return Integer.compare(a.length, b.length);
})
.reversed();
}

private static int compareVersionSegments(String sa, String sb) {
int cmp = Long.compare(parseVersionSegment(sa), parseVersionSegment(sb));
if (cmp != 0) {
return cmp;
}
String suffixA = suffix(sa);
String suffixB = suffix(sb);
if (suffixA.isEmpty() != suffixB.isEmpty()) {
return suffixA.isEmpty() ? 1 : -1;
}
return suffixA.compareTo(suffixB);
}
Comment on lines +383 to +394

@elharo elharo Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@copilot done


private static String suffix(String s) {
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if (c < '0' || c > '9') {
return s.substring(i);
}
}
return "";
}

private static long parseVersionSegment(String s) {
long n = 0;
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if (c < '0' || c > '9') {
break;
}
n = n * 10 + (c - '0');
}
return n;
}

private Set<Path> findJdks() {
if (foundJdks == null) {
synchronized (this) {
Expand Down
102 changes: 102 additions & 0 deletions src/test/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscovererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
*/
package org.apache.maven.plugins.toolchain.jdk;

import java.util.ArrayList;
import java.util.List;

import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre;
Expand All @@ -27,6 +31,7 @@
import org.slf4j.LoggerFactory;

import static org.apache.maven.plugins.toolchain.jdk.ToolchainDiscoverer.CURRENT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand All @@ -51,4 +56,101 @@ void testDiscovery() {
assertTrue(persistedToolchains.getToolchains().stream()
.anyMatch(tc -> tc.getProvides().containsKey(CURRENT)));
}

@Test
void testVersionComparatorSimple() {
ToolchainDiscoverer discoverer = new ToolchainDiscoverer();

List<ToolchainModel> list = new ArrayList<>();
list.add(toolchain("8"));
list.add(toolchain("17"));
list.add(toolchain("11"));

list.sort(discoverer.version());

assertEquals("17", list.get(0).getProvides().getProperty("version"));
assertEquals("11", list.get(1).getProvides().getProperty("version"));
assertEquals("8", list.get(2).getProvides().getProperty("version"));
}

@Test
void testVersionComparatorMultiPart() {
ToolchainDiscoverer discoverer = new ToolchainDiscoverer();

List<ToolchainModel> list = new ArrayList<>();
list.add(toolchain("11.0.1"));
list.add(toolchain("11.0.31"));
list.add(toolchain("17.0.1"));
list.add(toolchain("1.8"));

list.sort(discoverer.version());

assertEquals("17.0.1", list.get(0).getProvides().getProperty("version"));
assertEquals("11.0.31", list.get(1).getProvides().getProperty("version"));
assertEquals("11.0.1", list.get(2).getProvides().getProperty("version"));
assertEquals("1.8", list.get(3).getProvides().getProperty("version"));
}

@Test
void testVersionComparatorMultiDigitSegments() {
ToolchainDiscoverer discoverer = new ToolchainDiscoverer();

List<ToolchainModel> list = new ArrayList<>();
list.add(toolchain("17.0.2"));
list.add(toolchain("17.0.10"));

list.sort(discoverer.version());

assertEquals("17.0.10", list.get(0).getProvides().getProperty("version"));
assertEquals("17.0.2", list.get(1).getProvides().getProperty("version"));
}
Comment on lines +94 to +106

@elharo elharo Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@copilot done


@Test
void testVersionComparatorWithNonNumericSuffix() {
ToolchainDiscoverer discoverer = new ToolchainDiscoverer();

List<ToolchainModel> list = new ArrayList<>();
list.add(toolchain("1.8.0_202"));
list.add(toolchain("1.8.0_121"));

list.sort(discoverer.version());

assertEquals("1.8.0_202", list.get(0).getProvides().getProperty("version"));
assertEquals("1.8.0_121", list.get(1).getProvides().getProperty("version"));
}

@Test
void testVersionComparatorWithEAPreRelease() {
ToolchainDiscoverer discoverer = new ToolchainDiscoverer();

List<ToolchainModel> list = new ArrayList<>();
list.add(toolchain("11-ea"));
list.add(toolchain("11"));

list.sort(discoverer.version());

assertEquals("11", list.get(0).getProvides().getProperty("version"));
assertEquals("11-ea", list.get(1).getProvides().getProperty("version"));
}

@Test
void testVersionComparatorSuffixVsSuffix() {
ToolchainDiscoverer discoverer = new ToolchainDiscoverer();

List<ToolchainModel> list = new ArrayList<>();
list.add(toolchain("17.0.2+8"));
list.add(toolchain("17.0.2+4"));

list.sort(discoverer.version());

assertEquals("17.0.2+8", list.get(0).getProvides().getProperty("version"));
assertEquals("17.0.2+4", list.get(1).getProvides().getProperty("version"));
}

private static ToolchainModel toolchain(String version) {
ToolchainModel model = new ToolchainModel();
model.setType("jdk");
model.addProvide("version", version);
return model;
}
}
Loading