luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improved fix for #155

This commit is contained in:
Mark Harrah 2011-08-22 22:45:05 -04:00
parent 6961dff60e
commit 964f83244a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ivy/ConvertResolver.scala
View File

@ -3,6 +3,7 @@
*/ */
package sbt package sbt
import java.util.Collections
import org.apache.ivy.{core,plugins} import org.apache.ivy.{core,plugins}
import core.module.id.ModuleRevisionId import core.module.id.ModuleRevisionId
import core.settings.IvySettings import core.settings.IvySettings
@ -18,10 +19,16 @@ private object ConvertResolver
{ {
case repo: MavenRepository => case repo: MavenRepository =>
{ {
val resolver = new IBiblioResolver val pattern = Collections.singletonList(repo.root + Resolver.mavenStyleBasePattern)
final class PluginCapableResolver extends IBiblioResolver {
def setPatterns() { // done this way for access to protected methods.
setArtifactPatterns(pattern)
setIvyPatterns(pattern)
}
}
val resolver = new PluginCapableResolver
initializeMavenStyle(resolver, repo.name, repo.root) initializeMavenStyle(resolver, repo.name, repo.root)
resolver.addArtifactPattern(Resolver.mavenStyleBasePattern) resolver.setPatterns() // has to be done after initializeMavenStyle, which calls methods that overwrite the patterns
resolver.addIvyPattern(Resolver.mavenStyleBasePattern)
resolver resolver
} }
case r: JavaNet1Repository => case r: JavaNet1Repository =>