From b7770bc52e15b09679e6cf6a3b77dfc5d0665202 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 16 Sep 2013 11:57:02 -0400 Subject: [PATCH] parse external pom.xml with CustomPomParser to handle multiple definitions. Fixes #758. This is the same issue fixed by 74c07c64a78447274be47804a6f5f5019c571dab but in this case the cause was the top-level pom.xml, which didn't go through CustomPomParser. --- ivy/src/main/scala/sbt/Ivy.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivy/src/main/scala/sbt/Ivy.scala b/ivy/src/main/scala/sbt/Ivy.scala index 51f538740..6154bdbe8 100644 --- a/ivy/src/main/scala/sbt/Ivy.scala +++ b/ivy/src/main/scala/sbt/Ivy.scala @@ -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