Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 22:45:45 +01:00
Code Issues Packages Projects Releases Activity

merge with branch issue-299

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-01-08 09:53:42 +01:00
parent 5300057e34 516e09c256
commit d8a8901a97
4 changed files with 102 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java
View File

@@ -35,9 +35,6 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
import org.apache.maven.repository.internal.DefaultVersionRangeResolver;
import org.apache.maven.repository.internal.DefaultVersionResolver;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.slf4j.Logger;
@@ -45,15 +42,9 @@ import org.slf4j.LoggerFactory;
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.collection.CollectRequest;
import org.sonatype.aether.connector.async.AsyncRepositoryConnectorFactory;
import org.sonatype.aether.connector.file.FileRepositoryConnectorFactory;
import org.sonatype.aether.graph.Dependency;
import org.sonatype.aether.graph.DependencyFilter;
import org.sonatype.aether.graph.DependencyNode;
import org.sonatype.aether.impl.ArtifactDescriptorReader;
import org.sonatype.aether.impl.VersionRangeResolver;
import org.sonatype.aether.impl.VersionResolver;
import org.sonatype.aether.impl.internal.DefaultServiceLocator;
import org.sonatype.aether.repository.LocalArtifactRegistration;
import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.LocalRepositoryManager;
@@ -61,7 +52,6 @@ import org.sonatype.aether.repository.Proxy;
import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.repository.RepositoryPolicy;
import org.sonatype.aether.resolution.DependencyRequest;
import org.sonatype.aether.spi.connector.RepositoryConnectorFactory;
import org.sonatype.aether.util.artifact.DefaultArtifact;
import org.sonatype.aether.util.graph.PreorderNodeListGenerator;
@@ -347,19 +337,7 @@ public class AetherPluginHandler
*/
private RepositorySystem createRepositorySystem()
{
DefaultServiceLocator locator = new DefaultServiceLocator();
locator.addService(VersionResolver.class, DefaultVersionResolver.class);
locator.addService(VersionRangeResolver.class,
DefaultVersionRangeResolver.class);
locator.addService(ArtifactDescriptorReader.class,
DefaultArtifactDescriptorReader.class);
locator.addService(RepositoryConnectorFactory.class,
AsyncRepositoryConnectorFactory.class);
locator.addService(RepositoryConnectorFactory.class,
FileRepositoryConnectorFactory.class);
return locator.getService(RepositorySystem.class);
return new AetherServiceLocator().getService(RepositorySystem.class);
}
/**