From 9e045edab8318dd2f2b83e8c6d314d73a49e53d7 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 4 Jan 2011 11:10:31 -0500
Subject: [PATCH] always use 'jar' as packaging type if there is an artifact
 with a 'jar' type

---
 ivy/MakePom.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala
index d6a392fc8..be09ecc48 100644
--- a/ivy/MakePom.scala
+++ b/ivy/MakePom.scala
@@ -77,8 +77,9 @@ class MakePom
 			case Array() => "pom"
 			case Array(x) => x.getType
 			case xs =>
-				val notpom = xs.filter(_.getType != "pom")
-				if(notpom.isEmpty) "pom" else notpom(0).getType
+				val types = xs.map(_.getType)
+				val notpom = types.toList - "pom"
+				if(notpom.isEmpty) "pom" else if(notpom contains "jar") "jar" else notpom.head
 		}
 
 	def makeDependencies(module: ModuleDescriptor, configurations: Option[Iterable[Configuration]]): NodeSeq =