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

Fix classifier support and corresponding test 

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1039 d89573ee-9141-11dd-94d4-bdf5e562f29c
This commit is contained in:
dmharrah 2009-09-25 02:07:27 +00:00
parent 391734b167
commit f167888030
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/sbt/ManageDependencies.scala
View File

@ -552,7 +552,7 @@ object ManageDependencies
private def extra(artifact: Artifact) =
{
val ea = artifact.classifier match { case Some(c) => artifact.extra("e:classifier" -> c); case None => artifact }
javaMap(artifact.extraAttributes)
javaMap(ea.extraAttributes)
}
private def javaMap(map: Map[String,String]) = if(map.isEmpty) null else wrap.Wrappers.javaMap(map.toSeq : _*)
private def toURL(file: File) = file.toURI.toURL

2
src/sbt-test/dependency-management/classifier/project/build/Test.scala
View File

@ -2,5 +2,7 @@ import sbt._
class Test(info: ProjectInfo) extends DefaultProject(info)
{
def ivyCacheDirectory = outputPath / "ivy-cache"
override def updateOptions = CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
val testng = "org.testng" % "testng" % "5.7" classifier "jdk15"
}