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

Merge pull request #222 from jberkel/0.11 

Added support for <classifier> in makePom
This commit is contained in:
Mark Harrah 2011-10-11 18:06:50 -07:00
parent d605408950 2f52a17b6b
commit 34716b312c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ivy/MakePom.scala
View File

@ -132,6 +132,7 @@ class MakePom(val log: Logger)
<artifactId>{mrid.getName}</artifactId>
<version>{mrid.getRevision}</version>
{ scopeAndOptional(dependency) }
{ classifier(dependency) }
{
val (warns, excls) = List.separate(excl.map(makeExclusion))
if(!warns.isEmpty) log.warn(warns.mkString(IO.Newline))
@ -144,6 +145,13 @@ class MakePom(val log: Logger)
</dependency>
}
def classifier(dependency: DependencyDescriptor): Seq[scala.xml.Node] =
{
for (da <- dependency.getAllDependencyArtifacts;
cl <- Option(da.getExtraAttribute("classifier"))) yield
<classifier>{cl}</classifier>
}
def scopeAndOptional(dependency: DependencyDescriptor): NodeSeq =
{
val (scope, opt) = getScopeAndOptional(dependency.getModuleConfigurations)
@ -238,4 +246,4 @@ class MakePom(val log: Logger)
}
module.getDependencies flatMap translate
}
}
}