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

register installed to local repository manager, to fix issue #306

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-01-02 09:03:10 +01:00
parent 595e92c26d
commit 28431b0f3f
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,9 @@ import org.sonatype.aether.impl.ArtifactDescriptorReader;
import org.sonatype.aether.impl.VersionRangeResolver; import org.sonatype.aether.impl.VersionRangeResolver;
import org.sonatype.aether.impl.VersionResolver; import org.sonatype.aether.impl.VersionResolver;
import org.sonatype.aether.impl.internal.DefaultServiceLocator; import org.sonatype.aether.impl.internal.DefaultServiceLocator;
import org.sonatype.aether.repository.LocalArtifactRegistration;
import org.sonatype.aether.repository.LocalRepository; import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.LocalRepositoryManager;
import org.sonatype.aether.repository.Proxy; import org.sonatype.aether.repository.Proxy;
import org.sonatype.aether.repository.RemoteRepository; import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.repository.RepositoryPolicy; import org.sonatype.aether.repository.RepositoryPolicy;
@@ -68,6 +70,7 @@ import sonia.scm.SCMContextProvider;
import sonia.scm.boot.BootstrapListener; import sonia.scm.boot.BootstrapListener;
import sonia.scm.boot.Classpath; import sonia.scm.boot.Classpath;
import sonia.scm.config.ScmConfiguration; import sonia.scm.config.ScmConfiguration;
import sonia.scm.net.Proxies;
import sonia.scm.util.IOUtil; import sonia.scm.util.IOUtil;
import sonia.scm.util.Util; import sonia.scm.util.Util;
@@ -84,7 +87,6 @@ import java.util.Set;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller; import javax.xml.bind.Marshaller;
import sonia.scm.net.Proxies;
/** /**
* *
@@ -261,8 +263,17 @@ public class AetherPluginHandler
session.setProxySelector(new DefaultProxySelector(configuration)); session.setProxySelector(new DefaultProxySelector(configuration));
} }
session.setLocalRepositoryManager( // register installed to local repository manager
repositorySystem.newLocalRepositoryManager(localRepository)); LocalRepositoryManager localRepositoryManager =
repositorySystem.newLocalRepositoryManager(localRepository);
for (Dependency dep : dependencies)
{
localRepositoryManager.add(session,
new LocalArtifactRegistration(dep.getArtifact()));
}
session.setLocalRepositoryManager(localRepositoryManager);
try try
{ {