Skip to content

Revert accidental direct push of version comparator fix #178

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
elharo merged 2 commits into from
Jul 22, 2026
+12 −80
Merged

Revert accidental direct push of version comparator fix #178

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
3e7d3af
Revert "Expand version comparator test with multi-part version strings"
elharo Jul 22, 2026
5128ab7
Revert "Fix version comparator: use numeric comparison instead of lex…
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
25 changes: 12 additions & 13 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,25 +370,24 @@ Comparator<ToolchainModel> version() {
String[] b = v2.split("\\.");
int length = Math.min(a.length, b.length);
for (int i = 0; i < length; i++) {
int oa = parseInt(a[i]);
int ob = parseInt(b[i]);
if (oa != ob) {
return Integer.compare(oa, ob);
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;
}
}
}
return Integer.compare(a.length, b.length);
return a.length - b.length;
})
.reversed();
}

private static int parseInt(String s) {
try {
return Integer.parseInt(s);
} catch (NumberFormatException e) {
return 0;
}
}

private Set<Path> findJdks() {
if (foundJdks == null) {
synchronized (this) {
Expand Down
67 changes: 0 additions & 67 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,11 +18,7 @@
*/
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 @@ -31,7 +27,6 @@
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 @@ -56,66 +51,4 @@ void testDiscovery() {
assertTrue(persistedToolchains.getToolchains().stream()
.anyMatch(tc -> tc.getProvides().containsKey(CURRENT)));
}

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

ToolchainModel jdk8 = new ToolchainModel();
jdk8.setType("jdk");
jdk8.addProvide("version", "8");

ToolchainModel jdk11 = new ToolchainModel();
jdk11.setType("jdk");
jdk11.addProvide("version", "11");

ToolchainModel jdk17 = new ToolchainModel();
jdk17.setType("jdk");
jdk17.addProvide("version", "17");

List<ToolchainModel> list = new ArrayList<>();
list.add(jdk8);
list.add(jdk17);
list.add(jdk11);

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();

ToolchainModel v1 = new ToolchainModel();
v1.setType("jdk");
v1.addProvide("version", "11.0.1");

ToolchainModel v2 = new ToolchainModel();
v2.setType("jdk");
v2.addProvide("version", "11.0.31");

ToolchainModel v3 = new ToolchainModel();
v3.setType("jdk");
v3.addProvide("version", "17.0.1");

ToolchainModel v4 = new ToolchainModel();
v4.setType("jdk");
v4.addProvide("version", "1.8");

List<ToolchainModel> list = new ArrayList<>();
list.add(v1);
list.add(v2);
list.add(v3);
list.add(v4);

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"));
}
}
Loading