From 14148c96f7f1b5c2fe9a43cb222459367f31acdf Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Fri, 19 Sep 2014 13:06:50 -0400
Subject: [PATCH] Fix #1598 - Ivy fails to load evicted information.

Upgrade to a version of ivy 2.3.0 that has a backported fix for conflict resolver.
---
 notes/0.13.7/ivy-load-artifacts.md | 7 +++++++
 project/Util.scala                 | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 notes/0.13.7/ivy-load-artifacts.md

diff --git a/notes/0.13.7/ivy-load-artifacts.md b/notes/0.13.7/ivy-load-artifacts.md
new file mode 100644
index 000000000..9eb17509f
--- /dev/null
+++ b/notes/0.13.7/ivy-load-artifacts.md
@@ -0,0 +1,7 @@
+  [1598]: https://github.com/sbt/sbt/issues/1598
+  [@jsuereth]: https://github.com/jsuereth
+  
+
+### Fixes
+
+* Backported ivy fix to not throw exceptions when modules are evicted.  [#1598][1598] by [@jsuereth][@jsuereth]
diff --git a/project/Util.scala b/project/Util.scala
index 87b1f5a4a..1aa735f24 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -174,7 +174,7 @@ object Common {
   def lib(m: ModuleID) = libraryDependencies += m
   lazy val jlineDep = "jline" % "jline" % "2.11"
   lazy val jline = lib(jlineDep)
-  lazy val ivy = lib("org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-ba72610c018ef6b640551964f61d79a480b4c4e4")
+  lazy val ivy = lib("org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-fccfbd44c9f64523b61398a0155784dcbaeae28f")
   lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
   lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive ())
   lazy val sbinary = libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"