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

parse external pom.xml with CustomPomParser to handle multiple definitions. 

Fixes #758.  This is the same issue fixed by 74c07c64a7
but in this case the cause was the top-level pom.xml, which didn't go through CustomPomParser.
This commit is contained in:
Mark Harrah 2013-09-16 11:57:02 -04:00
parent d9ce0a0a04
commit b7770bc52e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/src/main/scala/sbt/Ivy.scala
View File

@ -168,7 +168,7 @@ final class IvySbt(val configuration: IvyConfiguration)
/** Parses the Maven pom 'pomFile' from the given `PomConfiguration`.*/
private def configurePom(pc: PomConfiguration) =
{
val md = PomModuleDescriptorParser.getInstance.parseDescriptor(settings, toURL(pc.file), pc.validate)
val md = CustomPomParser.default.parseDescriptor(settings, toURL(pc.file), pc.validate)
val dmd = IvySbt.toDefaultModuleDescriptor(md)
IvySbt.addConfigurations(dmd, Configurations.defaultInternal)
val defaultConf = Configurations.DefaultMavenConfiguration.name