mirror of https://github.com/sbt/sbt.git
Added support for <classifier> in makePom
Avoid second call to getExtraAttribute
This commit is contained in:
parent
d605408950
commit
2f52a17b6b
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue