From 37f937402f631f251266cfa0ce94c20fdb6c1143 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 16 Jan 2013 10:26:33 -0500
Subject: [PATCH] Ivy Artifact needs wildcard configuration added if no
 explicit ones are defined.  Fixes #439.

---
 ivy/src/main/scala/sbt/Ivy.scala              | 11 +++++++++--
 .../deliver-artifacts/build.sbt               | 19 +++++++++++++++++++
 .../deliver-artifacts/test                    |  2 ++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 sbt/src/sbt-test/dependency-management/deliver-artifacts/build.sbt
 create mode 100644 sbt/src/sbt-test/dependency-management/deliver-artifacts/test

diff --git a/ivy/src/main/scala/sbt/Ivy.scala b/ivy/src/main/scala/sbt/Ivy.scala
index 9260f3ed1..e4e3f26c5 100644
--- a/ivy/src/main/scala/sbt/Ivy.scala
+++ b/ivy/src/main/scala/sbt/Ivy.scala
@@ -420,7 +420,7 @@ private object IvySbt
 	private def toIvyArtifact(moduleID: ModuleDescriptor, a: Artifact, configurations: Iterable[String]): MDArtifact =
 	{
 		val artifact = new MDArtifact(moduleID, a.name, a.`type`, a.extension, null, extra(a, false))
-		configurations.foreach(artifact.addConfiguration)
+		copyConfigurations(a, artifact.addConfiguration)
 		artifact
 	}
 	def getExtraAttributes(revID: ExtendableItem): Map[String,String] =
@@ -563,6 +563,7 @@ private object IvySbt
 			import artifact.{name, classifier, `type`, extension, url}
 			val extraMap = extra(artifact)
 			val ivyArtifact = new DefaultDependencyArtifactDescriptor(dependencyDescriptor, name, `type`, extension, url.getOrElse(null), extraMap)
+			copyConfigurations(artifact, ivyArtifact.addConfiguration)
 			for(conf <- dependencyDescriptor.getModuleConfigurations)
 				dependencyDescriptor.addDependencyArtifact(conf, ivyArtifact)
 		}
@@ -575,6 +576,11 @@ private object IvySbt
 		}
 		dependencyDescriptor
 	}
+	def copyConfigurations(artifact: Artifact, addConfiguration: String => Unit): Unit =
+		if(artifact.configurations.isEmpty)
+			addConfiguration("*")
+		else
+			artifact.configurations.foreach(c => addConfiguration(c.name))
 
 	def addOverrides(moduleID: DefaultModuleDescriptor, overrides: Set[ModuleID], matcher: PatternMatcher): Unit =
 		overrides foreach addOverride(moduleID, matcher)
@@ -601,8 +607,9 @@ private object IvySbt
 
 	/** This method is used to add inline artifacts to the provided module. */
 	def addArtifacts(moduleID: DefaultModuleDescriptor, artifacts: Iterable[Artifact]): Unit =
-		for(art <- mapArtifacts(moduleID, artifacts.toSeq); c <- art.getConfigurations)
+		for(art <- mapArtifacts(moduleID, artifacts.toSeq); c <- art.getConfigurations if c != "*")
 			moduleID.addArtifact(c, art)
+
 	def addConfigurations(mod: DefaultModuleDescriptor, configurations: Iterable[Configuration]): Unit =
 			configurations.foreach(config => mod.addConfiguration(toIvyConfiguration(config)))
 
diff --git a/sbt/src/sbt-test/dependency-management/deliver-artifacts/build.sbt b/sbt/src/sbt-test/dependency-management/deliver-artifacts/build.sbt
new file mode 100644
index 000000000..caec21b61
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/deliver-artifacts/build.sbt
@@ -0,0 +1,19 @@
+// verifies that a can be published as an ivy.xml file and preserve the extra artifact information,
+//   such as a classifier
+lazy val a = project.settings(common: _*).settings(
+	libraryDependencies := Seq("net.sf.json-lib" % "json-lib" % "2.4" classifier "jdk15" intransitive())
+)
+
+lazy val b = project.settings(common: _*).settings(
+	libraryDependencies := Seq(organization.value %% "a" % version.value)
+)
+
+organization in ThisBuild := "org.example"
+
+version in ThisBuild := "1.0"
+
+lazy val common = Seq(
+	autoScalaLibrary := false, // avoid downloading fresh scala-library/scala-compiler
+	managedScalaInstance := false,
+	ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache"))
+)
diff --git a/sbt/src/sbt-test/dependency-management/deliver-artifacts/test b/sbt/src/sbt-test/dependency-management/deliver-artifacts/test
new file mode 100644
index 000000000..ce76ad583
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/deliver-artifacts/test
@@ -0,0 +1,2 @@
+> a/publish-local
+> b/update
\ No newline at end of file