From 606b55e26adf085d1e2779de533dcf92117bbe20 Mon Sep 17 00:00:00 2001 From: Teletha Date: Thu, 5 Jan 2023 14:50:36 +0900 Subject: [PATCH] feat: resolve conflict by nearest-latest-strategy --- src/main/java/bee/Bee.java | 2 +- src/main/java/bee/api/Repository.java | 14 ++++++-------- src/project/java/bee/Project.java | 4 ++-- src/test/java/bee/api/DownloadTest.java | 11 ++++++++--- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/bee/Bee.java b/src/main/java/bee/Bee.java index dfd822df1..7db79a1cb 100644 --- a/src/main/java/bee/Bee.java +++ b/src/main/java/bee/Bee.java @@ -304,7 +304,7 @@ public void execute() { * @param tasks A list of task commands */ public static void main(String... tasks) { - if (tasks.length == 0) tasks = new String[] {"ide"}; + if (tasks.length == 0) tasks = new String[] {"install"}; System.exit(new Bee().execute(BeeOption.parse(tasks))); } diff --git a/src/main/java/bee/api/Repository.java b/src/main/java/bee/api/Repository.java index 499243749..56877d901 100644 --- a/src/main/java/bee/api/Repository.java +++ b/src/main/java/bee/api/Repository.java @@ -202,8 +202,6 @@ private static final void addRemoteRepository(String name, String url) { session.setCache(new DefaultRepositoryCache()); session.setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(ResolutionErrorPolicy.CACHE_ALL, ResolutionErrorPolicy.CACHE_ALL)); session.setConfigProperty("maven.artifact.threads", 24); - // session.setConfigProperty("aether.dependencyCollector.impl", "bf"); - // session.setConfigProperty("aether.conflictResolver.verbose", true); session.setOffline(BeeOption.Offline.value()); // event listener @@ -251,14 +249,18 @@ private Set collectDependency(Project project, Set scopes, Set { List list = I.signal(parents).startWith(node).skip(p -> p.getArtifact() == null).toList(); - return list.isEmpty() || list.stream().allMatch(n -> { return scope.accept(n.getDependency().getScope()); }); @@ -272,10 +274,6 @@ private Set collectDependency(Project project, Set scopes, Set collectDependency = repository.collectDependency(project, Scope.Compile, Scope.Annotation); + for (Library library : collectDependency) { + System.out.println(library); + } } } \ No newline at end of file