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

merge with branch issue-76

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-12-14 18:58:14 +01:00
parent 5bddcc1ab8 3e1422e5f7
commit f9995da04b
2 changed files with 3 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scm-webapp/pom.xml
View File

@@ -195,48 +195,8 @@
<dependency> <dependency>
<groupId>org.sonatype.aether</groupId> <groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId> <artifactId>aether-connector-asynchttpclient</artifactId>
<version>${aether.version}</version> <version>${aether.version}</version>
<exclusions>
<exclusion>
<artifactId>xbean-reflect</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
<artifactId>sisu-inject-plexus</artifactId>
<groupId>org.sonatype.sisu</groupId>
</exclusion>
<exclusion>
<artifactId>plexus-classworlds</artifactId>
<groupId>org.codehaus.plexus</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>${wagon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<version>${wagon.version}</version>
<exclusions>
<exclusion>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
</exclusion>
<exclusion>
<groupId>nekohtml</groupId>
<artifactId>xercesMinimal</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- rest documentation --> <!-- rest documentation -->

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

@@ -39,16 +39,13 @@ import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
import org.apache.maven.repository.internal.DefaultVersionRangeResolver; import org.apache.maven.repository.internal.DefaultVersionRangeResolver;
import org.apache.maven.repository.internal.DefaultVersionResolver; import org.apache.maven.repository.internal.DefaultVersionResolver;
import org.apache.maven.repository.internal.MavenRepositorySystemSession; import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.providers.http.LightweightHttpWagon;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.sonatype.aether.RepositorySystem; import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.collection.CollectRequest; import org.sonatype.aether.collection.CollectRequest;
import org.sonatype.aether.connector.wagon.WagonProvider; import org.sonatype.aether.connector.async.AsyncRepositoryConnectorFactory;
import org.sonatype.aether.connector.wagon.WagonRepositoryConnectorFactory;
import org.sonatype.aether.graph.Dependency; import org.sonatype.aether.graph.Dependency;
import org.sonatype.aether.graph.DependencyFilter; import org.sonatype.aether.graph.DependencyFilter;
import org.sonatype.aether.graph.DependencyNode; import org.sonatype.aether.graph.DependencyNode;
@@ -355,18 +352,8 @@ public class AetherPluginHandler
DefaultVersionRangeResolver.class); DefaultVersionRangeResolver.class);
locator.addService(ArtifactDescriptorReader.class, locator.addService(ArtifactDescriptorReader.class,
DefaultArtifactDescriptorReader.class); DefaultArtifactDescriptorReader.class);
locator.setServices(WagonProvider.class, new WagonProvider()
{
@Override
public Wagon lookup(String roleHint) throws Exception
{
return new LightweightHttpWagon();
}
@Override
public void release(Wagon wagon) {}
});
locator.addService(RepositoryConnectorFactory.class, locator.addService(RepositoryConnectorFactory.class,
WagonRepositoryConnectorFactory.class); AsyncRepositoryConnectorFactory.class);
return locator.getService(RepositorySystem.class); return locator.getService(RepositorySystem.class);
} }