rife2/rife2
rife2/rife2
2
0
Fork 0
mirror of https://github.com/ethauvin/rife2.git synced 2025-04-30 10:38:12 -07:00
Code Activity

Fix to version number pattern

Browse source
This commit is contained in:
Geert Bevin 2023-04-05 07:56:05 -04:00
parent 6593f60306
commit 8220f919bf
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/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>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<revision>\\d+))?)?(?:(?<separator>[.\\-])(?<qualifier>.*[^.\\-]))??$");
/** /**
* Parses a version number from a string representation. * Parses a version number from a string representation.

4
lib/src/test/java/rife/bld/dependencies/TestVersionNumber.java
View file

@ -44,6 +44,9 @@ public class TestVersionNumber {
assertEquals(VersionNumber.parse("1.0.0.0.0.0.0"), new VersionNumber(1, 0, 0, "0.0.0.0")); assertEquals(VersionNumber.parse("1.0.0.0.0.0.0"), new VersionNumber(1, 0, 0, "0.0.0.0"));
assertEquals(VersionNumber.parse("1.2.3.4-rc1-SNAPSHOT"), new VersionNumber(1, 2, 3, "4-rc1-SNAPSHOT")); assertEquals(VersionNumber.parse("1.2.3.4-rc1-SNAPSHOT"), new VersionNumber(1, 2, 3, "4-rc1-SNAPSHOT"));
assertEquals(VersionNumber.parse("1.2.3.4.rc1-SNAPSHOT"), new VersionNumber(1, 2, 3, "4.rc1-SNAPSHOT")); assertEquals(VersionNumber.parse("1.2.3.4.rc1-SNAPSHOT"), new VersionNumber(1, 2, 3, "4.rc1-SNAPSHOT"));
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"));
} }
@Test @Test
@ -72,7 +75,6 @@ public class TestVersionNumber {
assertEquals(VersionNumber.parse("a.1"), VersionNumber.UNKNOWN); assertEquals(VersionNumber.parse("a.1"), VersionNumber.UNKNOWN);
assertEquals(VersionNumber.parse("1_2"), VersionNumber.UNKNOWN); assertEquals(VersionNumber.parse("1_2"), VersionNumber.UNKNOWN);
assertEquals(VersionNumber.parse("1_2_2"), VersionNumber.UNKNOWN); assertEquals(VersionNumber.parse("1_2_2"), VersionNumber.UNKNOWN);
assertEquals(VersionNumber.parse("1.2.3_4"), VersionNumber.UNKNOWN);
} }
@Test @Test