diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java index 1e42d84637..67bf4e8a40 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java @@ -30,6 +30,7 @@ */ + package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- @@ -116,32 +117,17 @@ public class AetherDependencyResolver * * * @param dependency + * @param dependencies * * @throws DependencyCollectionException * @throws DependencyResolutionException */ - public void resolveLocalDependency(Dependency dependency) + public void resolveDependencies(Dependency dependency, + List dependencies) throws DependencyCollectionException, DependencyResolutionException { - CollectRequest request = new CollectRequest(); - - request.setRoot(dependency); - resolveDependency(request); - } - - /** - * Method description - * - * - * @param dependency - * - * @throws DependencyCollectionException - * @throws DependencyResolutionException - */ - public void resolveRemoteDependency(Dependency dependency) - throws DependencyCollectionException, DependencyResolutionException - { - resolveDependency(new CollectRequest(dependency, remoteRepositories)); + resolveDependency(new CollectRequest(dependency, dependencies, + remoteRepositories)); } /** diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java index f35a6b4976..7de5397a23 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java @@ -199,12 +199,7 @@ public class AetherPluginHandler new AetherDependencyResolver(configuration, repositorySystem, localRepository, remoteRepositories); - resolver.resolveRemoteDependency(dependency); - - for (Dependency localDependency : localDependencies) - { - resolver.resolveLocalDependency(localDependency); - } + resolver.resolveDependencies(dependency, localDependencies); if (classpath == null) {