From 2f52a17b6b7c2f5fa3d1807a543f5e3a3844a61e Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Mon, 10 Oct 2011 18:10:47 +0200 Subject: [PATCH] Added support for in makePom Avoid second call to getExtraAttribute --- ivy/MakePom.scala | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala index 262a1ee35..b85334e97 100644 --- a/ivy/MakePom.scala +++ b/ivy/MakePom.scala @@ -132,6 +132,7 @@ class MakePom(val log: Logger) {mrid.getName} {mrid.getRevision} { 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) } + def classifier(dependency: DependencyDescriptor): Seq[scala.xml.Node] = + { + for (da <- dependency.getAllDependencyArtifacts; + cl <- Option(da.getExtraAttribute("classifier"))) yield + {cl} + } + def scopeAndOptional(dependency: DependencyDescriptor): NodeSeq = { val (scope, opt) = getScopeAndOptional(dependency.getModuleConfigurations) @@ -238,4 +246,4 @@ class MakePom(val log: Logger) } module.getDependencies flatMap translate } -} \ No newline at end of file +}