Filip/bld
1
0
Fork 0
mirror of https://github.com/rife2/bld synced 2026-07-03 08:27:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup of --auto argument, now named --auto-download-purge.

Browse source 
Instead of randomized repositories in tests, round-robin repositories so that the tests are repeatable.
This commit is contained in:
Geert Bevin 2026-06-23 22:37:57 -04:00
parent f1468a24c6
commit c4228fb067
6 changed files with 106 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/rife/bld/BaseProject.java
View file

@ -26,6 +26,13 @@ import static rife.tools.FileUtils.JAR_FILE_PATTERN;
* @since 1.5.20 * @since 1.5.20
*/ */
public class BaseProject extends BuildExecutor { public class BaseProject extends BuildExecutor {
/**
* The CLI option to trigger automatic dependency download and purge.
*
* @since 2.3.1
*/
public static final String AUTO_DOWNLOAD_PURGE_OPTION = "--auto-download-purge";
/** /**
* The work directory of the project. * The work directory of the project.
* *
@ -534,22 +541,7 @@ public class BaseProject extends BuildExecutor {
@BuildCommand(help = DownloadHelp.class) @BuildCommand(help = DownloadHelp.class)
public void download() public void download()
throws Exception { throws Exception {
var auto = false; downloadOperation().executeOnce(() -> downloadOperation().fromProject(this));
var arguments = this.arguments();
while (!arguments.isEmpty()) {
var argument = arguments.get(0);
if (DownloadOperation.AUTO_OPTION.equals(argument)) {
arguments.remove(0);
auto = true;
} else {
break;
}
}
if (auto) {
performAutoDownloadPurge();
} else {
downloadOperation().executeOnce(() -> downloadOperation().fromProject(this));
}
} }
/** /**
@ -2026,11 +2018,14 @@ public class BaseProject extends BuildExecutor {
@Override @Override
public int execute(String[] arguments) { public int execute(String[] arguments) {
var remainingArguments = new ArrayList<>(List.of(arguments));
var auto = remainingArguments.remove(AUTO_DOWNLOAD_PURGE_OPTION);
if (!offline() && if (!offline() &&
autoDownloadPurge()) { (autoDownloadPurge() || auto)) {
performAutoDownloadPurge(); performAutoDownloadPurge();
} }
return super.execute(arguments); return super.execute(remainingArguments.toArray(new String[0]));
} }
} }

7
src/main/java/rife/bld/help/DownloadHelp.java
View file

@ -5,7 +5,6 @@
package rife.bld.help; package rife.bld.help;
import rife.bld.CommandHelp; import rife.bld.CommandHelp;
import rife.bld.operations.DownloadOperation;
/** /**
* Provides help for the download command. * Provides help for the download command.
@ -15,13 +14,13 @@ import rife.bld.operations.DownloadOperation;
*/ */
public class DownloadHelp implements CommandHelp { public class DownloadHelp implements CommandHelp {
public String getSummary() { public String getSummary() {
return "Downloads all dependencies of the project (take option)"; return "Downloads all dependencies of the project";
} }
public String getDescription(String topic) { public String getDescription(String topic) {
return String.format(""" return String.format("""
Downloads all dependencies of the project Downloads all dependencies of the project
Usage : %s [%s]""", topic, DownloadOperation.AUTO_OPTION); Usage : %s""", topic);
} }
} }

1
src/main/java/rife/bld/operations/DownloadOperation.java
View file

@ -25,7 +25,6 @@ import static rife.bld.dependencies.Dependency.CLASSIFIER_SOURCES;
* @since 1.5 * @since 1.5
*/ */
public class DownloadOperation extends AbstractOperation<DownloadOperation> { public class DownloadOperation extends AbstractOperation<DownloadOperation> {
public static final String AUTO_OPTION = "--auto";
private boolean offline_ = false; private boolean offline_ = false;
private HierarchicalProperties properties_ = null; private HierarchicalProperties properties_ = null;
private ArtifactRetriever retriever_ = null; private ArtifactRetriever retriever_ = null;

24
src/test/java/rife/bld/dependencies/RepositoryTestHelper.java
View file

@ -4,10 +4,9 @@
*/ */
package rife.bld.dependencies; package rife.bld.dependencies;
import java.security.SecureRandom;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Repository.*;
@ -20,17 +19,17 @@ public final class RepositoryTestHelper {
GOOGLE_MAVEN_CENTRAL_ASIA GOOGLE_MAVEN_CENTRAL_ASIA
); );
private static final SecureRandom SECURE_RANDOM = new SecureRandom(); private static final AtomicInteger COUNTER = new AtomicInteger(0);
private RepositoryTestHelper() { private RepositoryTestHelper() {
} }
public static Repository getRandomRepository() { public static Repository getNextRepository() {
int index = SECURE_RANDOM.nextInt(MAVEN_CENTRAL_REPOSITORIES.size()); var index = COUNTER.getAndIncrement() % MAVEN_CENTRAL_REPOSITORIES.size();
return MAVEN_CENTRAL_REPOSITORIES.get(index); return MAVEN_CENTRAL_REPOSITORIES.get(index);
} }
public static List<Repository> getRandomRepositories(int count) { public static List<Repository> getNextRepositories(int count) {
if (count < 0) { if (count < 0) {
throw new IllegalArgumentException("count cannot be negative"); throw new IllegalArgumentException("count cannot be negative");
} }
@ -39,12 +38,15 @@ public final class RepositoryTestHelper {
+ MAVEN_CENTRAL_REPOSITORIES.size()); + MAVEN_CENTRAL_REPOSITORIES.size());
} }
List<Repository> shuffled = new ArrayList<>(MAVEN_CENTRAL_REPOSITORIES); var start = COUNTER.getAndAdd(count) % MAVEN_CENTRAL_REPOSITORIES.size();
Collections.shuffle(shuffled, SECURE_RANDOM); var result = new ArrayList<Repository>(count);
return Collections.unmodifiableList(shuffled.subList(0, count)); for (var i = 0; i < count; i++) {
result.add(MAVEN_CENTRAL_REPOSITORIES.get((start + i) % MAVEN_CENTRAL_REPOSITORIES.size()));
}
return List.copyOf(result);
} }
public static List<Repository> getRandomRepositories() { public static List<Repository> getNextRepositories() {
return getRandomRepositories(2); return getNextRepositories(2);
} }
} }

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

@ -38,38 +38,38 @@ public class TestDependencyResolver {
@Test @Test
void testNotFound() { void testNotFound() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.org.unknown", "voidthing")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.org.unknown", "voidthing"));
assertFalse(resolver.exists()); assertFalse(resolver.exists());
} }
@Test @Test
void testCheckExistence() { void testCheckExistence() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.uwyn.rife2", "rife2"));
assertTrue(resolver.exists()); assertTrue(resolver.exists());
} }
@Test @Test
void testCheckExistenceVersion() { void testCheckExistenceVersion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0)));
assertTrue(resolver.exists()); assertTrue(resolver.exists());
} }
@Test @Test
void testCheckExistenceMissingVersion() { void testCheckExistenceMissingVersion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 3, 9))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 3, 9)));
assertFalse(resolver.exists()); assertFalse(resolver.exists());
} }
@Test @Test
void testCheckVersionOverride() { void testCheckVersionOverride() {
var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "com.uwyn.rife2:rife2:1.8.0")), var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "com.uwyn.rife2:rife2:1.8.0")),
ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 3, 9))); ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 3, 9)));
assertEquals(new VersionNumber(1, 8, 0), resolver.resolveVersion()); assertEquals(new VersionNumber(1, 8, 0), resolver.resolveVersion());
} }
@Test @Test
void testListVersions() { void testListVersions() {
var resolver1 = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.uwyn.rife2", "rife2")); var resolver1 = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.uwyn.rife2", "rife2"));
var versions1 = resolver1.listVersions(); var versions1 = resolver1.listVersions();
assertNotNull(versions1); assertNotNull(versions1);
assertFalse(versions1.isEmpty()); assertFalse(versions1.isEmpty());
@ -77,7 +77,7 @@ public class TestDependencyResolver {
assertTrue(versions1.contains(new VersionNumber(1, 0, 0))); assertTrue(versions1.contains(new VersionNumber(1, 0, 0)));
assertTrue(versions1.contains(new VersionNumber(1, 2, 1))); assertTrue(versions1.contains(new VersionNumber(1, 2, 1)));
var resolver2 = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.eclipse.jetty", "jetty-server")); var resolver2 = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.eclipse.jetty", "jetty-server"));
var versions2 = resolver2.listVersions(); var versions2 = resolver2.listVersions();
assertNotNull(versions2); assertNotNull(versions2);
assertFalse(versions2.isEmpty()); assertFalse(versions2.isEmpty());
@ -88,7 +88,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetLatestVersion() { void testGetLatestVersion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(3), new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(3), new Dependency("com.uwyn.rife2", "rife2"));
var version = resolver.latestVersion(); var version = resolver.latestVersion();
assertNotNull(version); assertNotNull(version);
assertTrue(version.compareTo(new VersionNumber(1, 4)) >= 0); assertTrue(version.compareTo(new VersionNumber(1, 4)) >= 0);
@ -96,7 +96,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetReleaseVersion() { void testGetReleaseVersion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(4), new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(4), new Dependency("com.uwyn.rife2", "rife2"));
var version = resolver.releaseVersion(); var version = resolver.releaseVersion();
assertNotNull(version); assertNotNull(version);
assertTrue(version.compareTo(new VersionNumber(1, 4)) >= 0); assertTrue(version.compareTo(new VersionNumber(1, 4)) >= 0);
@ -104,7 +104,7 @@ public class TestDependencyResolver {
@Test @Test
void testMetadata() { void testMetadata() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(5), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(5), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0)));
var metadata = resolver.getMavenMetadata(); var metadata = resolver.getMavenMetadata();
assertNotNull(metadata); assertNotNull(metadata);
assertTrue(metadata.getLatest().compareTo(resolver.dependency().version()) > 0); assertTrue(metadata.getLatest().compareTo(resolver.dependency().version()) > 0);
@ -113,7 +113,7 @@ public class TestDependencyResolver {
@Test @Test
void testSnapshotMetadata() { void testSnapshotMetadata() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var metadata = resolver.getSnapshotMavenMetadata(); var metadata = resolver.getSnapshotMavenMetadata();
assertNotNull(metadata); assertNotNull(metadata);
assertEquals("20241227.175755", metadata.getSnapshotTimestamp()); assertEquals("20241227.175755", metadata.getSnapshotTimestamp());
@ -122,7 +122,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesRIFE2() { void testGetCompileDependenciesRIFE2() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.uwyn.rife2", "rife2"));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(0, dependencies.size()); assertEquals(0, dependencies.size());
@ -130,7 +130,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesRIFE2Snapshot() { void testGetCompileDependenciesRIFE2Snapshot() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(0, dependencies.size()); assertEquals(0, dependencies.size());
@ -138,7 +138,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesGoogleApi() { void testGetCompileDependenciesGoogleApi() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0")));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(1, dependencies.size()); assertEquals(1, dependencies.size());
@ -148,7 +148,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesJetty() { void testGetCompileDependenciesJetty() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(4, dependencies.size()); assertEquals(4, dependencies.size());
@ -161,7 +161,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesAssertJ() { void testGetCompileDependenciesAssertJ() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.assertj", "assertj-joda-time", new VersionNumber(2, 2, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.assertj", "assertj-joda-time", new VersionNumber(2, 2, 0)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(1, dependencies.size()); assertEquals(1, dependencies.size());
@ -171,7 +171,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesSwagger() { void testGetCompileDependenciesSwagger() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("io.swagger.core.v3", "swagger-core", new VersionNumber(2,2,27))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("io.swagger.core.v3", "swagger-core", new VersionNumber(2,2,27)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(11, dependencies.size()); assertEquals(11, dependencies.size());
@ -192,7 +192,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesJettyOverride1() { void testGetCompileDependenciesJettyOverride1() {
var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.16")), var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.16")),
ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(4, dependencies.size()); assertEquals(4, dependencies.size());
@ -206,7 +206,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesJettyOverride2() { void testGetCompileDependenciesJettyOverride2() {
var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.11,org.eclipse.jetty:jetty-io:11.0.13,org.eclipse.jetty:jetty-server:11.0.15")), var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.11,org.eclipse.jetty:jetty-io:11.0.13,org.eclipse.jetty:jetty-server:11.0.15")),
ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(4, dependencies.size()); assertEquals(4, dependencies.size());
@ -219,7 +219,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileRuntimeDependenciesJunit() { void testGetCompileRuntimeDependenciesJunit() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.junit.jupiter", "junit-jupiter", new VersionNumber(5, 9, 2))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.junit.jupiter", "junit-jupiter", new VersionNumber(5, 9, 2)));
var dependencies_compile = resolver.getDirectDependencies(compile, runtime); var dependencies_compile = resolver.getDirectDependencies(compile, runtime);
assertNotNull(dependencies_compile); assertNotNull(dependencies_compile);
assertEquals(3, dependencies_compile.size()); assertEquals(3, dependencies_compile.size());
@ -231,7 +231,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesSpringBoot() { void testGetCompileDependenciesSpringBoot() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(6, dependencies.size()); assertEquals(6, dependencies.size());
@ -246,7 +246,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesMaven() { void testGetCompileDependenciesMaven() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.apache.maven", "maven-core", new VersionNumber(3, 9, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.apache.maven", "maven-core", new VersionNumber(3, 9, 0)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(26, dependencies.size()); assertEquals(26, dependencies.size());
@ -281,7 +281,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesPlay() { void testGetCompileDependenciesPlay() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(25, dependencies.size()); assertEquals(25, dependencies.size());
@ -315,7 +315,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileDependenciesVaadin() { void testGetCompileDependenciesVaadin() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.vaadin", "vaadin", new VersionNumber(23, 3, 7))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.vaadin", "vaadin", new VersionNumber(23, 3, 7)));
var dependencies = resolver.getDirectDependencies(compile); var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(9, dependencies.size()); assertEquals(9, dependencies.size());
@ -333,7 +333,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileRuntimeDependenciesBitly() { void testGetCompileRuntimeDependenciesBitly() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0)));
var dependencies = resolver.getDirectDependencies(compile, runtime); var dependencies = resolver.getDirectDependencies(compile, runtime);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(6, dependencies.size()); assertEquals(6, dependencies.size());
@ -348,7 +348,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesRIFE2() { void testGetCompileTransitiveDependenciesRIFE2() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.uwyn.rife2", "rife2"));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(1, dependencies.size()); assertEquals(1, dependencies.size());
@ -358,7 +358,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesRIFE2Snapshot() { void testGetCompileTransitiveDependenciesRIFE2Snapshot() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(1, dependencies.size()); assertEquals(1, dependencies.size());
@ -368,7 +368,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesJetty() { void testGetCompileTransitiveDependenciesJetty() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(6, dependencies.size()); assertEquals(6, dependencies.size());
@ -383,7 +383,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesJettyExclusion() { void testGetCompileTransitiveDependenciesJettyExclusion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(),
new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)) new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))
.exclude("org.slf4j", "slf4j-api")); .exclude("org.slf4j", "slf4j-api"));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
@ -399,7 +399,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesJettyFullGroupExclusion() { void testGetCompileTransitiveDependenciesJettyFullGroupExclusion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(),
new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)) new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))
.exclude("org.eclipse.jetty", "*")); .exclude("org.eclipse.jetty", "*"));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
@ -413,7 +413,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesJettyFullArtifactExclusion() { void testGetCompileTransitiveDependenciesJettyFullArtifactExclusion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(),
new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)) new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))
.exclude("*", "jetty-http") .exclude("*", "jetty-http")
.exclude("*", "slf4j-api")); .exclude("*", "slf4j-api"));
@ -429,7 +429,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesJettyFullExclusion() { void testGetCompileTransitiveDependenciesJettyFullExclusion() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(),
new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)) new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))
.exclude("*", "*")); .exclude("*", "*"));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
@ -441,8 +441,8 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesJettyAndSlfj() { void testGetCompileTransitiveDependenciesJettyAndSlfj() {
var dependencies = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))).getAllDependencies(compile); var dependencies = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))).getAllDependencies(compile);
var dependencies2 = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6))).getAllDependencies(compile, runtime); var dependencies2 = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6))).getAllDependencies(compile, runtime);
assertNotNull(dependencies); assertNotNull(dependencies);
assertNotNull(dependencies2); assertNotNull(dependencies2);
assertEquals(6, dependencies.size()); assertEquals(6, dependencies.size());
@ -461,7 +461,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileRuntimeTransitiveDependenciesJunit() { void testGetCompileRuntimeTransitiveDependenciesJunit() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.junit.jupiter", "junit-jupiter", new VersionNumber(5, 9, 2))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.junit.jupiter", "junit-jupiter", new VersionNumber(5, 9, 2)));
var dependencies_compile = resolver.getAllDependencies(compile, runtime); var dependencies_compile = resolver.getAllDependencies(compile, runtime);
assertNotNull(dependencies_compile); assertNotNull(dependencies_compile);
assertEquals(8, dependencies_compile.size()); assertEquals(8, dependencies_compile.size());
@ -484,7 +484,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesSpringBoot() { void testGetCompileTransitiveDependenciesSpringBoot() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4)));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(18, dependencies.size()); assertEquals(18, dependencies.size());
@ -511,7 +511,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesMaven() { void testGetCompileTransitiveDependenciesMaven() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.apache.maven", "maven-core", new VersionNumber(3, 9, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.apache.maven", "maven-core", new VersionNumber(3, 9, 0)));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(32, dependencies.size()); assertEquals(32, dependencies.size());
@ -552,7 +552,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesPlay() { void testGetCompileTransitiveDependenciesPlay() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19)));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(48, dependencies.size()); assertEquals(48, dependencies.size());
@ -609,7 +609,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileTransitiveDependenciesVaadin() { void testGetCompileTransitiveDependenciesVaadin() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("com.vaadin", "vaadin", new VersionNumber(23, 3, 7))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("com.vaadin", "vaadin", new VersionNumber(23, 3, 7)));
var dependencies = resolver.getAllDependencies(compile); var dependencies = resolver.getAllDependencies(compile);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(88, dependencies.size()); assertEquals(88, dependencies.size());
@ -706,7 +706,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileRuntimeTransitiveDependenciesBitly() { void testGetCompileRuntimeTransitiveDependenciesBitly() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0)));
var dependencies = resolver.getAllDependencies(compile, runtime); var dependencies = resolver.getAllDependencies(compile, runtime);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(11, dependencies.size()); assertEquals(11, dependencies.size());
@ -726,7 +726,7 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileRuntimeTransitiveDependenciesMariaDb() { void testGetCompileRuntimeTransitiveDependenciesMariaDb() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.mariadb.jdbc", "mariadb-java-client", new VersionNumber(3, 1, 3))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.mariadb.jdbc", "mariadb-java-client", new VersionNumber(3, 1, 3)));
var dependencies_compile = resolver.getAllDependencies(compile, runtime); var dependencies_compile = resolver.getAllDependencies(compile, runtime);
assertNotNull(dependencies_compile); assertNotNull(dependencies_compile);
assertEquals(9, dependencies_compile.size()); assertEquals(9, dependencies_compile.size());
@ -750,7 +750,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependency() void testTransferDependency()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.uwyn.rife2", "rife2"));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -774,7 +774,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySources() void testTransferDependencySources()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.uwyn.rife2", "rife2"));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -799,7 +799,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySourcesJavadoc() void testTransferDependencySourcesJavadoc()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.uwyn.rife2", "rife2"));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -825,7 +825,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySnapshot() void testTransferDependencySnapshot()
throws Exception { throws Exception {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
try { try {
@ -847,7 +847,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySnapshotSources() void testTransferDependencySnapshotSources()
throws Exception { throws Exception {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
try { try {
@ -871,7 +871,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySnapshotSourcesJavadoc() void testTransferDependencySnapshotSourcesJavadoc()
throws Exception { throws Exception {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
try { try {
@ -897,7 +897,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySourcesModule() void testTransferDependencySourcesModule()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("com.uwyn.rife2", "rife2"));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -922,7 +922,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySourcesJavadocModule() void testTransferDependencySourcesJavadocModule()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("com.uwyn.rife2", "rife2")); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("com.uwyn.rife2", "rife2"));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -948,7 +948,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySnapshotModule() void testTransferDependencySnapshotModule()
throws Exception { throws Exception {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
try { try {
@ -970,7 +970,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySnapshotSourcesModule() void testTransferDependencySnapshotSourcesModule()
throws Exception { throws Exception {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository(), RIFE2_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository(), RIFE2_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 9, 1, "SNAPSHOT")));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
try { try {
@ -1020,7 +1020,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJetty() void testTransferDependencyJetty()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1057,7 +1057,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJettyModule() void testTransferDependencyJettyModule()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1094,7 +1094,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySwagger() void testTransferDependencySwagger()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("io.swagger.core.v3", "swagger-core", new VersionNumber(2,2,27))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("io.swagger.core.v3", "swagger-core", new VersionNumber(2,2,27)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1147,7 +1147,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyGoogleApi() void testTransferDependencyGoogleApi()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0")));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1220,7 +1220,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyGoogleApiModule() void testTransferDependencyGoogleApiModule()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0")));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1293,7 +1293,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJettyOverriddenVersions() void testTransferDependencyJettyOverriddenVersions()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolution = new VersionResolution(new HierarchicalProperties() var resolution = new VersionResolution(new HierarchicalProperties()
.put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.11") .put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.11")
.put(PROPERTY_OVERRIDE_PREFIX + "1", "org.eclipse.jetty:jetty-io:11.0.13") .put(PROPERTY_OVERRIDE_PREFIX + "1", "org.eclipse.jetty:jetty-io:11.0.13")
@ -1334,7 +1334,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJettyOverriddenVersionsModule() void testTransferDependencyJettyOverriddenVersionsModule()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolution = new VersionResolution(new HierarchicalProperties() var resolution = new VersionResolution(new HierarchicalProperties()
.put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.11") .put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.11")
.put(PROPERTY_OVERRIDE_PREFIX + "1", "org.eclipse.jetty:jetty-io:11.0.13") .put(PROPERTY_OVERRIDE_PREFIX + "1", "org.eclipse.jetty:jetty-io:11.0.13")
@ -1375,7 +1375,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJettySources() void testTransferDependencyJettySources()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1424,7 +1424,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJettySourcesModule() void testTransferDependencyJettySourcesModule()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1473,7 +1473,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJettySourcesJavadoc() void testTransferDependencyJettySourcesJavadoc()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1534,7 +1534,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyJettySourcesJavadocModule() void testTransferDependencyJettySourcesJavadocModule()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1595,7 +1595,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependenciesJunit() void testTransferDependenciesJunit()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos , new Dependency("org.junit.jupiter", "junit-jupiter", new VersionNumber(5, 9, 2))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos , new Dependency("org.junit.jupiter", "junit-jupiter", new VersionNumber(5, 9, 2)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1636,7 +1636,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencySpringBoot() void testTransferDependencySpringBoot()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1697,7 +1697,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyMaven() void testTransferDependencyMaven()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.apache.maven", "maven-core", new VersionNumber(3, 9, 0))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("org.apache.maven", "maven-core", new VersionNumber(3, 9, 0)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1786,7 +1786,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyPlay() void testTransferDependencyPlay()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos, new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -1907,7 +1907,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyPlayOverriddenVersions() void testTransferDependencyPlayOverriddenVersions()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolution = new VersionResolution(new HierarchicalProperties() var resolution = new VersionResolution(new HierarchicalProperties()
.put(PROPERTY_OVERRIDE_PREFIX, "org.scala-lang:scala-library:2.13.12,org.slf4j:slf4j-api:2.0.11,com.google.guava:guava:31.1-jre")); .put(PROPERTY_OVERRIDE_PREFIX, "org.scala-lang:scala-library:2.13.12,org.slf4j:slf4j-api:2.0.11,com.google.guava:guava:31.1-jre"));
var resolver = new DependencyResolver(resolution, ArtifactRetriever.instance(), repos, new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19))); var resolver = new DependencyResolver(resolution, ArtifactRetriever.instance(), repos, new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19)));
@ -2029,7 +2029,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferDependencyVaadin() void testTransferDependencyVaadin()
throws Exception { throws Exception {
var repos = getRandomRepositories(); var repos = getNextRepositories();
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos , new Dependency("com.vaadin", "vaadin", new VersionNumber(23, 3, 7))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), repos , new Dependency("com.vaadin", "vaadin", new VersionNumber(23, 3, 7)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
@ -2229,7 +2229,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferCheckExisting() void testTransferCheckExisting()
throws Exception { throws Exception {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
try { try {
@ -2287,7 +2287,7 @@ public class TestDependencyResolver {
@Test @Test
void testTransferCheckExistingModule() void testTransferCheckExistingModule()
throws Exception { throws Exception {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getRandomRepositories(), new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), getNextRepositories(), new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var tmp1 = Files.createTempDirectory("transfers").toFile(); var tmp1 = Files.createTempDirectory("transfers").toFile();
var tmp2 = Files.createTempDirectory("modules").toFile(); var tmp2 = Files.createTempDirectory("modules").toFile();
try { try {

14
src/test/java/rife/bld/dependencies/TestDependencySet.java
View file

@ -11,7 +11,7 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Repository.*;
import static rife.bld.dependencies.RepositoryTestHelper.getRandomRepository; import static rife.bld.dependencies.RepositoryTestHelper.getNextRepository;
import static rife.bld.dependencies.Scope.compile; import static rife.bld.dependencies.Scope.compile;
import static rife.bld.dependencies.Scope.runtime; import static rife.bld.dependencies.Scope.runtime;
@ -92,7 +92,7 @@ public class TestDependencySet {
│ └─ org.eclipse.jetty:jetty-io:11.0.14 │ └─ org.eclipse.jetty:jetty-io:11.0.14
└─ org.slf4j:slf4j-simple:2.0.6 └─ org.slf4j:slf4j-simple:2.0.6
└─ org.slf4j:slf4j-api:2.0.6 └─ org.slf4j:slf4j-api:2.0.6
"""), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository()), compile)); """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository()), compile));
} }
@Test @Test
@ -118,7 +118,7 @@ public class TestDependencySet {
├─ org.springframework:spring-core:6.0.6 ├─ org.springframework:spring-core:6.0.6
│ └─ org.springframework:spring-jcl:6.0.6 │ └─ org.springframework:spring-jcl:6.0.6
└─ org.yaml:snakeyaml:1.33 └─ org.yaml:snakeyaml:1.33
"""), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository()), compile)); """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository()), compile));
} }
@Test @Test
@ -158,7 +158,7 @@ public class TestDependencySet {
├─ org.codehaus.plexus:plexus-component-annotations:2.1.0 ├─ org.codehaus.plexus:plexus-component-annotations:2.1.0
├─ org.apache.commons:commons-lang3:3.8.1 ├─ org.apache.commons:commons-lang3:3.8.1
└─ org.slf4j:slf4j-api:1.7.36 └─ org.slf4j:slf4j-api:1.7.36
"""), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository()), compile)); """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository()), compile));
} }
@Test @Test
@ -214,7 +214,7 @@ public class TestDependencySet {
├─ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 ├─ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2
├─ com.typesafe:ssl-config-core_2.13:0.4.3 ├─ com.typesafe:ssl-config-core_2.13:0.4.3
└─ org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2 └─ org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2
"""), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository()), compile)); """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository()), compile));
} }
@Test @Test
@ -310,7 +310,7 @@ public class TestDependencySet {
│ ├─ net.java.dev.jna:jna:5.11.0 │ ├─ net.java.dev.jna:jna:5.11.0
│ └─ net.java.dev.jna:jna-platform:5.11.0 │ └─ net.java.dev.jna:jna-platform:5.11.0
└─ com.auth0:java-jwt:3.19.2 └─ com.auth0:java-jwt:3.19.2
"""), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository()), compile)); """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository()), compile));
} }
@Test @Test
@ -353,7 +353,7 @@ public class TestDependencySet {
└─ com.google.zxing:javase:3.5.1 └─ com.google.zxing:javase:3.5.1
├─ com.google.zxing:core:3.5.1 ├─ com.google.zxing:core:3.5.1
└─ com.beust:jcommander:1.82 └─ com.beust:jcommander:1.82
"""), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getRandomRepository()), compile)); """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(getNextRepository()), compile));
} }
@Test @Test