Use Aether for transitive dependencies.

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt

@@ -2,12 +2,10 @@ package com.beust.kobalt.maven
 
 import com.beust.kobalt.KobaltException
 import com.beust.kobalt.api.*
-import com.beust.kobalt.maven.aether.ConsoleRepositoryListener
 import com.beust.kobalt.maven.aether.KobaltAether
 import com.beust.kobalt.maven.dependency.FileDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
-import com.beust.kobalt.misc.log
 import com.google.common.collect.ArrayListMultimap
 import java.io.File
 import java.util.*
@@ -111,42 +109,18 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
      * Return the transitive closure of the dependencies *without* running the classpath contributors.
      * TODO: This should be private, everyone should be calling calculateDependencies().
      */
-    fun transitiveClosure(dependencies : List<IClasspathDependency>, requiredBy: String? = null,
+    fun transitiveClosure(dependencies : List<IClasspathDependency>, requiredBy: String? = null):
-            indent : String = "  "):
             List<IClasspathDependency> {
-        val executor = executors.newExecutor("JvmCompiler}", 10)
+        val result = arrayListOf<IClasspathDependency>()
-
+        dependencies.forEach {
-        val result = hashSetOf<IClasspathDependency>()
+            result.add(it)
-
+            if (it.isMaven) {
-        dependencies.forEach { projectDependency ->
+                val resolved = aether.resolveAll(it.id).map { it.toString() }
-            log(ConsoleRepositoryListener.LOG_LEVEL, "$indent Resolving $projectDependency")
+                result.addAll(resolved.map { create(it) })
-            result.add(projectDependency)
-            projectDependency.id.let {
-                result.add(create(it))
-                val downloaded = transitiveClosure(projectDependency.directDependencies(), projectDependency.id,
-                        indent + "  ")
-
-                result.addAll(downloaded)
             }
         }
-
         val reordered = reorderDependencies(result)
-
+        return reordered
-        val nonexistent = reordered.filter{ ! it.jarFile.get().exists() }
-        if (nonexistent.any()) {
-            throw KobaltException("Couldn't resolve dependency $nonexistent"
-                    + (if (requiredBy != null) " required by $requiredBy" else ""))
-        }
-
-        val result2 = reordered.filter {
-            // Only keep existent files (nonexistent files are probably optional dependencies or parent poms
-            // that point to other poms but don't have a jar file themselves)
-            it.jarFile.get().exists()
-        }
-
-        executor.shutdown()
-
-        return result2
     }
 
     /**

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt

@@ -50,10 +50,15 @@ class KobaltAether @Inject constructor (val settings: KobaltSettings, val aether
             DependencyResult(AetherDependency(it.artifact), it.repository.toString())
         }
 
+    fun resolveAll(id: String): List<String> {
+        val results = aether.resolve(DefaultArtifact(id))
+        return results.map { it.artifact.toString() }
+    }
+
     fun resolve(id: String): DependencyResult {
         log(ConsoleRepositoryListener.LOG_LEVEL, "Resolving $id")
         val results = aether.resolve(DefaultArtifact(MavenId.toKobaltId(id)))
-        if (results != null && results.size > 0) {
+        if (results.size > 0) {
             return DependencyResult(AetherDependency(results[0].artifact), results[0].repository.toString())
         } else {
             throw KobaltException("Couldn't resolve $id")