rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-26 00:37:10 -07:00
Code Activity

Still handle version ranges as an unknown version

Browse source
This commit is contained in:
Geert Bevin 2024-07-19 23:35:29 -04:00
parent 3ee8f81317
commit 4913519eb4
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,10 @@ public record VersionNumber(Integer major, Integer minor, Integer revision, Stri
var matcher = VERSION_PATTERN.matcher(version); var matcher = VERSION_PATTERN.matcher(version);
if (!matcher.matches()) { if (!matcher.matches()) {
// bld doesn't support version ranges at this time
if (version.startsWith("[") || version.startsWith("(")) {
return UNKNOWN;
}
return new VersionGeneric(version); return new VersionGeneric(version);
} }

10
src/test/java/rife/bld/dependencies/TestDependencyResolver.java
View file

@ -157,6 +157,16 @@ public class TestDependencyResolver {
org.slf4j:slf4j-api:2.0.5""", StringUtils.join(dependencies, "\n")); org.slf4j:slf4j-api:2.0.5""", StringUtils.join(dependencies, "\n"));
} }
@Test
void testGetCompileDependenciesAssertJ() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.assertj", "assertj-joda-time", new VersionNumber(2, 2, 0)));
var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies);
assertEquals(1, dependencies.size());
assertEquals("""
org.assertj:assertj-core""", StringUtils.join(dependencies, "\n"));
}
@Test @Test
void testGetCompileDependenciesJettyOverride1() { void testGetCompileDependenciesJettyOverride1() {
var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.13")), var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.13")),