Skip to content

Commit 7313d63

Browse files
committed
Include milestones in the ranking of version number "special meanings"
1 parent eb54e1e commit 7313d63

2 files changed

Lines changed: 30 additions & 6 deletions

File tree

src/main/java/org/openrewrite/java/dependencies/internal/StaticVersionComparator.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ public class StaticVersionComparator implements Comparator<Version> {
3232

3333
static {
3434
SPECIAL_MEANINGS.put("dev", -1);
35-
SPECIAL_MEANINGS.put("rc", 1);
36-
SPECIAL_MEANINGS.put("snapshot", 2);
37-
SPECIAL_MEANINGS.put("final", 3);
38-
SPECIAL_MEANINGS.put("ga", 4);
39-
SPECIAL_MEANINGS.put("release", 5);
40-
SPECIAL_MEANINGS.put("sp", 6);
35+
SPECIAL_MEANINGS.put("m", 1);
36+
SPECIAL_MEANINGS.put("rc", 2);
37+
SPECIAL_MEANINGS.put("snapshot", 3);
38+
SPECIAL_MEANINGS.put("final", 4);
39+
SPECIAL_MEANINGS.put("ga", 5);
40+
SPECIAL_MEANINGS.put("release", 6);
41+
SPECIAL_MEANINGS.put("sp", 7);
4142
}
4243

4344
/**
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package org.openrewrite.java.dependencies.internal;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
import static org.assertj.core.api.Assertions.assertThat;
6+
7+
8+
class StaticVersionComparatorTest {
9+
VersionParser vp = new VersionParser();
10+
StaticVersionComparator svc = new StaticVersionComparator();
11+
12+
@Test
13+
void milestone() {
14+
assertThat(svc.compare(v("2.0.0"), v("1.0.0"))).isEqualTo(1);
15+
assertThat(svc.compare(v("1.0.0"), v("1.0.0-M1"))).isEqualTo(1);
16+
assertThat(svc.compare(v("1.0.0-M2"), v("1.0.0-M1"))).isEqualTo(1);
17+
assertThat(svc.compare(v("1.0.0-rc-1"), v("1.0.0-M1"))).isEqualTo(1);
18+
}
19+
20+
Version v(String version) {
21+
return vp.transform(version);
22+
}
23+
}

0 commit comments

Comments
 (0)