From 9a7b9df293e2fc53b3889bbe1bf5a73da1572c20 Mon Sep 17 00:00:00 2001
From: Huw Giddens <hgiddens@gmail.com>
Date: Mon, 24 Aug 2015 16:55:41 +1000
Subject: [PATCH 1/3] Bump jline to 2.13.

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d676af4bc..6edb0c69b 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -8,7 +8,7 @@ object Dependencies {
   lazy val scala210 = "2.10.5"
   lazy val scala211 = "2.11.7"
 
-  lazy val jline = "jline" % "jline" % "2.11"
+  lazy val jline = "jline" % "jline" % "2.13"
   lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-927bc9ded7f8fba63297cddd0d5a3d01d6ad5d8d"
   lazy val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive ()
   lazy val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"

From 68330d042acd93388302e359405cc85dace99177 Mon Sep 17 00:00:00 2001
From: Huw Giddens <hgiddens@gmail.com>
Date: Mon, 24 Aug 2015 18:36:26 +1000
Subject: [PATCH 2/3] Add notes for PR.

---
 notes/0.13.10/upgrade-jline.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 notes/0.13.10/upgrade-jline.md

diff --git a/notes/0.13.10/upgrade-jline.md b/notes/0.13.10/upgrade-jline.md
new file mode 100644
index 000000000..5cea57217
--- /dev/null
+++ b/notes/0.13.10/upgrade-jline.md
@@ -0,0 +1,10 @@
+  [JLine2]: https://github.com/jline/jline2
+  [2173]: https://github.com/sbt/sbt/pull/2173
+
+### Fixes with compatibility implications
+
+### Improvements
+
+- [JLine2][] upgraded to version 2.13 (#[2173][2173]).
+
+### Bug fixes

From cbeaba0ccdef61460be118db88c11b9ed3d24c96 Mon Sep 17 00:00:00 2001
From: Huw Giddens <hgiddens@gmail.com>
Date: Wed, 11 Nov 2015 21:35:57 +1100
Subject: [PATCH 3/3] Update per the changes since August.

---
 notes/0.13.10/upgrade-jline.md | 3 ++-
 project/Dependencies.scala     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/notes/0.13.10/upgrade-jline.md b/notes/0.13.10/upgrade-jline.md
index 5cea57217..3540fe8a1 100644
--- a/notes/0.13.10/upgrade-jline.md
+++ b/notes/0.13.10/upgrade-jline.md
@@ -1,10 +1,11 @@
   [JLine2]: https://github.com/jline/jline2
+  [1681]: https://github.com/sbt/sbt/issues/1681
   [2173]: https://github.com/sbt/sbt/pull/2173
 
 ### Fixes with compatibility implications
 
 ### Improvements
 
-- [JLine2][] upgraded to version 2.13 (#[2173][2173]).
+- [JLine2][] upgraded to version 2.13 (#[1681][1681], #[2173][2173]).
 
 ### Bug fixes
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 6edb0c69b..8e37675a5 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
   lazy val scala211 = "2.11.7"
 
   lazy val jline = "jline" % "jline" % "2.13"
-  lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-927bc9ded7f8fba63297cddd0d5a3d01d6ad5d8d"
+  lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-d592b1b0f77cf706e882b1b8e0162dee28165fb2"
   lazy val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive ()
   lazy val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"
   lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.2"