From 8ff424711c54be4a711fa649cb92917dc976eb88 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
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 +-
 .../ext-pom-classifier/build.sbt              |  3 +
 .../ext-pom-classifier/pom.xml                | 78 +++++++++++++++++++
 .../ext-pom-classifier/src/test/scala/A.scala |  8 ++
 .../ext-pom-classifier/test                   |  3 +
 5 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt
 create mode 100644 sbt/src/sbt-test/dependency-management/ext-pom-classifier/pom.xml
 create mode 100644 sbt/src/sbt-test/dependency-management/ext-pom-classifier/src/test/scala/A.scala
 create mode 100644 sbt/src/sbt-test/dependency-management/ext-pom-classifier/test

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
diff --git a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt
new file mode 100644
index 000000000..273ac58dd
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt
@@ -0,0 +1,3 @@
+scalaVersion := "2.10.1"
+
+externalPom()
diff --git a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/pom.xml b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/pom.xml
new file mode 100644
index 000000000..414bc70fc
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>example</groupId>
+  <artifactId>example</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0.0-SNAPSHOT</version>
+  <build>
+    <sourceDirectory>src/main/scala</sourceDirectory>
+    <testSourceDirectory>src/test/scala</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <recompileMode>incremental</recompileMode>
+          <useZincServer>true</useZincServer>
+          <args>
+            <arg>-target:jvm-1.6</arg>
+            <arg>-feature</arg>
+            <arg>-deprecation</arg>
+            <arg>-encoding</arg>
+            <arg>UTF-8</arg>
+          </args>
+          <javacArgs>
+            <javacArg>-source</javacArg>
+            <javacArg>1.6</javacArg>
+            <javacArg>-Xlint:-options</javacArg>
+            <javacArg>-target</javacArg>
+            <javacArg>1.6</javacArg>
+          </javacArgs>
+          <jvmArgs>
+            <jvmArg>-Xmx768m</jvmArg>
+            <jvmArg>-Xss10m</jvmArg>
+          </jvmArgs>
+          <scalaVersion>${scala.version}</scalaVersion>
+        </configuration>
+        <executions>
+          <execution>
+            <id>scala-compile</id>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>2.10.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.5</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/src/test/scala/A.scala b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/src/test/scala/A.scala
new file mode 100644
index 000000000..4cdaff43d
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/src/test/scala/A.scala
@@ -0,0 +1,8 @@
+// Put in src/test/scala
+object Foo {
+  // From main slf4j-api JAR
+  val logger = org.slf4j.LoggerFactory.getLogger("Foo")
+  // From test slf4j-api JAR
+  val bp = new org.slf4j.helpers.BogoPerf
+}
+
diff --git a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/test b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/test
new file mode 100644
index 000000000..49047044e
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/test
@@ -0,0 +1,3 @@
+> export compile:dependencyClasspath
+> export test:dependencyClasspath
+> test:compile