From b31c510f389a639e24e5902c400158ee34f426c1 Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Sun, 20 Nov 2011 00:10:43 +0530 Subject: [PATCH] Add classifier for 'jar' artifact type only. Closes #257. --- ivy/MakePom.scala | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala index 21099e929..60127c603 100644 --- a/ivy/MakePom.scala +++ b/ivy/MakePom.scala @@ -49,7 +49,7 @@ class MakePom(val log: Logger) def makeModuleID(module: ModuleDescriptor): NodeSeq = { val mrid = moduleDescriptor(module) - val a: NodeSeq = + val a: NodeSeq = ({ mrid.getOrganisation } { mrid.getName } { packaging(module) }) @@ -137,11 +137,16 @@ class MakePom(val log: Logger) } - def classifier(dependency: DependencyDescriptor): Seq[scala.xml.Node] = + def classifier(dependency: DependencyDescriptor): NodeSeq = { - for (da <- dependency.getAllDependencyArtifacts; - cl <- Option(da.getExtraAttribute("classifier"))) yield - {cl} + val jarDep = dependency.getAllDependencyArtifacts.filter(_.getType == Artifact.DefaultType).headOption + jarDep match { + case Some(a) => { + val cl = a.getExtraAttribute("classifier") + if (cl != null) {cl} else NodeSeq.Empty + } + case _ => NodeSeq.Empty + } } def scopeAndOptional(dependency: DependencyDescriptor): NodeSeq =