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

Merge pull request #168 from indrajitr/0.11 

Honor <exclusions/> in <dependency/> when available
This commit is contained in:
Mark Harrah 2011-09-06 05:11:19 -07:00
parent ac1d5a9fd9 2585c57760
commit 496c6c1ef2
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/IvyActions.scala
View File

@ -68,7 +68,7 @@ object IvyActions
{ {
import configuration.{allRepositories, moduleInfo, configurations, extra, file, filterRepositories, process} import configuration.{allRepositories, moduleInfo, configurations, extra, file, filterRepositories, process}
module.withModule(log) { (ivy, md, default) => module.withModule(log) { (ivy, md, default) =>
(new MakePom).write(ivy, md, moduleInfo, configurations, extra, process, filterRepositories, allRepositories, file) (new MakePom(log)).write(ivy, md, moduleInfo, configurations, extra, process, filterRepositories, allRepositories, file)
log.info("Wrote " + file.getAbsolutePath) log.info("Wrote " + file.getAbsolutePath)
} }
} }

31
ivy/MakePom.scala
View File

@ -14,11 +14,11 @@ import Configurations.Optional
import org.apache.ivy.{core, plugins, Ivy} import org.apache.ivy.{core, plugins, Ivy}
import core.settings.IvySettings import core.settings.IvySettings
import core.module.{descriptor, id} import core.module.{descriptor, id}
import descriptor.{DependencyDescriptor, License, ModuleDescriptor} import descriptor.{DependencyDescriptor, License, ModuleDescriptor, ExcludeRule}
import id.ModuleRevisionId import id.ModuleRevisionId
import plugins.resolver.{ChainResolver, DependencyResolver, IBiblioResolver} import plugins.resolver.{ChainResolver, DependencyResolver, IBiblioResolver}
class MakePom class MakePom(val log: Logger)
{ {
def encoding = "UTF-8" def encoding = "UTF-8"
def write(ivy: Ivy, module: ModuleDescriptor, moduleInfo: ModuleInfo, configurations: Option[Iterable[Configuration]], extra: NodeSeq, process: XNode => XNode, filterRepositories: MavenRepository => Boolean, allRepositories: Boolean, output: File): Unit = def write(ivy: Ivy, module: ModuleDescriptor, moduleInfo: ModuleInfo, configurations: Option[Iterable[Configuration]], extra: NodeSeq, process: XNode => XNode, filterRepositories: MavenRepository => Boolean, allRepositories: Boolean, output: File): Unit =
@ -123,11 +123,21 @@ class MakePom
def makeDependency(dependency: DependencyDescriptor): NodeSeq = def makeDependency(dependency: DependencyDescriptor): NodeSeq =
{ {
val mrid = dependency.getDependencyRevisionId val mrid = dependency.getDependencyRevisionId
val excl = dependency.getExcludeRules(dependency.getModuleConfigurations)
<dependency> <dependency>
<groupId>{mrid.getOrganisation}</groupId> <groupId>{mrid.getOrganisation}</groupId>
<artifactId>{mrid.getName}</artifactId> <artifactId>{mrid.getName}</artifactId>
<version>{mrid.getRevision}</version> <version>{mrid.getRevision}</version>
{ scopeAndOptional(dependency)} { scopeAndOptional(dependency) }
{
val (warns, excls) = List.separate(excl.map(makeExclusion))
if(!warns.isEmpty) log.warn(warns.mkString(IO.Newline))
if(excls.isEmpty) NodeSeq.Empty
else
<exclusions>
{ excls }
</exclusions>
}
</dependency> </dependency>
} }
@ -159,6 +169,21 @@ class MakePom
(scope, !opt.isEmpty) (scope, !opt.isEmpty)
} }
def makeExclusion(exclRule: ExcludeRule): Either[String, NodeSeq] =
{
val m = exclRule.getId.getModuleId
val (g, a) = (m.getOrganisation, m.getName)
if(g == null || g.isEmpty || g == "*" || a.isEmpty || a == "*")
Left("Skipped generating '<exclusion/>' for %s. Dependency exclusion should have both 'org' and 'module' to comply with Maven POM's schema.".format(m))
else
Right(
<exclusion>
<groupId>{g}</groupId>
<artifactId>{a}</artifactId>
</exclusion>
)
}
def makeRepositories(settings: IvySettings, includeAll: Boolean, filterRepositories: MavenRepository => Boolean) = def makeRepositories(settings: IvySettings, includeAll: Boolean, filterRepositories: MavenRepository => Boolean) =
{ {
class MavenRepo(name: String, snapshots: Boolean, releases: Boolean) class MavenRepo(name: String, snapshots: Boolean, releases: Boolean)