rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 08:17:11 -07:00
Code Activity

Fixed version number parsing to properly detect numerical qualifiers.

Browse source 
Fixes #30
Fixes #28
This commit is contained in:
Geert Bevin 2024-05-01 15:12:38 -04:00
parent 708304235b
commit 917d6bbe93
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/rife/bld/dependencies/VersionNumber.java
View file

@ -32,7 +32,7 @@ public record VersionNumber(Integer major, Integer minor, Integer revision, Stri
*/ */
public static final VersionNumber UNKNOWN = new VersionNumber(0, 0, 0, ""); public static final VersionNumber UNKNOWN = new VersionNumber(0, 0, 0, "");
private static final Pattern VERSION_PATTERN = Pattern.compile("^(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<revision>\\d+))?)?(?:(?<separator>[.\\-])(?<qualifier>.*[^.\\-]))??$"); private static final Pattern VERSION_PATTERN = Pattern.compile("^(?<major>0|[1-9]\\d*)(?:\\.(?<minor>0|[1-9]\\d*)(?:\\.(?<revision>0|[1-9]\\d*))?)?(?:(?<separator>[.\\-])(?<qualifier>.*[^.\\-]))??$");
/** /**
* Parses a version number from a string representation. * Parses a version number from a string representation.

5
src/test/java/rife/bld/dependencies/TestVersionNumber.java
View file

@ -47,6 +47,11 @@ public class TestVersionNumber {
assertEquals(VersionNumber.parse("1.2.3_4"), new VersionNumber(1, 2, 0, "3_4")); assertEquals(VersionNumber.parse("1.2.3_4"), new VersionNumber(1, 2, 0, "3_4"));
assertEquals(VersionNumber.parse("1.54b"), new VersionNumber(1, 0, 0, "54b")); assertEquals(VersionNumber.parse("1.54b"), new VersionNumber(1, 0, 0, "54b"));
assertEquals(VersionNumber.parse("2024-02"), new VersionNumber(2024, null, null, "02"));
assertEquals(VersionNumber.parse("2.0-05"), new VersionNumber(2, 0, null, "05"));
assertEquals(VersionNumber.parse("2024.02"), new VersionNumber(2024, null, null, "02", "."));
assertEquals(VersionNumber.parse("2.0.05"), new VersionNumber(2, 0, null, "05", "."));
} }
@Test @Test