From c6a3b352c483181545d4d9349547536de21b564b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 14 Nov 2012 09:04:29 -0500
Subject: [PATCH] taking care of deprecations removed in Scala master

---
 ivy/Credentials.scala | 3 ++-
 ivy/Ivy.scala         | 2 +-
 ivy/IvyUtil.scala     | 7 +++++++
 ivy/MakePom.scala     | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 ivy/IvyUtil.scala

diff --git a/ivy/Credentials.scala b/ivy/Credentials.scala
index dc09adbcc..882e1c22b 100644
--- a/ivy/Credentials.scala
+++ b/ivy/Credentials.scala
@@ -33,13 +33,14 @@ object Credentials
 			case Right(dc) => dc
 		}
 	}
+
 	def loadCredentials(path: File): Either[String, DirectCredentials] =
 		if(path.exists)
 		{
 			val properties = read(path)
 			def get(keys: List[String]) = keys.flatMap(properties.get).headOption.toRight(keys.head + " not specified in credentials file: " + path)
 
-			List.separate( List(RealmKeys, HostKeys, UserKeys, PasswordKeys).map(get) ) match
+			IvyUtil.separate( List(RealmKeys, HostKeys, UserKeys, PasswordKeys).map(get) ) match
 			{
 				case (Nil, List(realm, host, user, pass)) => Right( new DirectCredentials(realm, host, user, pass) )
 				case (errors, _) => Left(errors.mkString("\n"))
diff --git a/ivy/Ivy.scala b/ivy/Ivy.scala
index 937648cc0..030d0c192 100644
--- a/ivy/Ivy.scala
+++ b/ivy/Ivy.scala
@@ -382,7 +382,7 @@ private object IvySbt
 	private[sbt] def javaMap(m: Map[String,String], unqualify: Boolean = false) =
 	{
 		val map = if(unqualify) m map { case (k, v) => (k.stripPrefix("e:"), v) } else m
-		if(map.isEmpty) null else scala.collection.JavaConversions.asJavaMap(map)
+		if(map.isEmpty) null else scala.collection.JavaConversions.mapAsJavaMap(map)
 	}
 
 	private object javaMap
diff --git a/ivy/IvyUtil.scala b/ivy/IvyUtil.scala
new file mode 100644
index 000000000..1c99bb5d3
--- /dev/null
+++ b/ivy/IvyUtil.scala
@@ -0,0 +1,7 @@
+package sbt
+
+private[sbt] object IvyUtil
+{
+	def separate[A,B](l: Seq[Either[A,B]]): (Seq[A], Seq[B]) =
+		(l.flatMap(_.left.toOption), l.flatMap(_.right.toOption))
+}
\ No newline at end of file
diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala
index 9d57bbace..c92de2aa0 100644
--- a/ivy/MakePom.scala
+++ b/ivy/MakePom.scala
@@ -237,7 +237,7 @@ class MakePom(val log: Logger)
 	def exclusions(dependency: DependencyDescriptor): NodeSeq =
 	{
 		val excl = dependency.getExcludeRules(dependency.getModuleConfigurations)
-		val (warns, excls) = List.separate(excl.map(makeExclusion))
+		val (warns, excls) = IvyUtil.separate(excl.map(makeExclusion))
 		if(!warns.isEmpty) log.warn(warns.mkString(IO.Newline))
 		if(!excls.isEmpty) <exclusions>{excls}</exclusions>
 		else NodeSeq.Empty