From 0ac485feb7457f6cf87788cdaefee75e6b5b7196 Mon Sep 17 00:00:00 2001 From: David Pratt Date: Thu, 5 Jun 2014 18:11:37 -0500 Subject: [PATCH] Add 'scala-jar' to the list of jar artifacts. The CustomPomParser has a hard-coded list of 'blessed' Maven POM packaging types that are actually packaged as jar files, but Ivy incorrectly maps the file extension. This patch allows artifacts published with the 'scala-jar' packaging to be properly resolved and used in an SBT project. --- ivy/src/main/scala/sbt/CustomPomParser.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivy/src/main/scala/sbt/CustomPomParser.scala b/ivy/src/main/scala/sbt/CustomPomParser.scala index 5e0deb7c4..bcb8a2476 100644 --- a/ivy/src/main/scala/sbt/CustomPomParser.scala +++ b/ivy/src/main/scala/sbt/CustomPomParser.scala @@ -37,7 +37,7 @@ object CustomPomParser { private[this] val unqualifiedKeys = Set(SbtVersionKey, ScalaVersionKey, ExtraAttributesKey, ApiURLKey) // packagings that should be jars, but that Ivy doesn't handle as jars - val JarPackagings = Set("eclipse-plugin", "hk2-jar", "orbit") + val JarPackagings = Set("eclipse-plugin", "hk2-jar", "orbit", "scala-jar") val default = new CustomPomParser(PomModuleDescriptorParser.getInstance, defaultTransform) private[this] val TransformedHashKey = "e:sbtTransformHash"