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

Add classifier for 'jar' artifact type only. Closes #257.

This commit is contained in:
Indrajit Raychaudhuri 2011-11-20 00:10:43 +05:30
parent c039925748
commit e69c1c3827
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ivy/MakePom.scala
View File

@ -49,7 +49,7 @@ class MakePom(val log: Logger)
def makeModuleID(module: ModuleDescriptor): NodeSeq =
{
val mrid = moduleDescriptor(module)
val a: NodeSeq =
val a: NodeSeq =
(<groupId>{ mrid.getOrganisation }</groupId>
<artifactId>{ mrid.getName }</artifactId>
<packaging>{ packaging(module) }</packaging>)
@ -137,11 +137,16 @@ class MakePom(val log: Logger)
</dependency>
}
def classifier(dependency: DependencyDescriptor): Seq[scala.xml.Node] =
def classifier(dependency: DependencyDescriptor): NodeSeq =
{
for (da <- dependency.getAllDependencyArtifacts;
cl <- Option(da.getExtraAttribute("classifier"))) yield
<classifier>{cl}</classifier>
val jarDep = dependency.getAllDependencyArtifacts.filter(_.getType == Artifact.DefaultType).headOption
jarDep match {
case Some(a) => {
val cl = a.getExtraAttribute("classifier")
if (cl != null) <classifier>{cl}</classifier> else NodeSeq.Empty
}
case _ => NodeSeq.Empty
}
}
def scopeAndOptional(dependency: DependencyDescriptor): NodeSeq =