diff --git a/notes/0.13.7/ivy-no-httpclient.md b/notes/0.13.7/ivy-no-httpclient.md new file mode 100644 index 000000000..fb59e0fac --- /dev/null +++ b/notes/0.13.7/ivy-no-httpclient.md @@ -0,0 +1,7 @@ + [1602]: https://github.com/sbt/sbt/pull/1602 + [@jsuereth]: https://github.com/jsuereth + + +### Fixes + +* Ivy no longer silently flops to HttpClient resolver when httpclient is on the classpath. [#1602][1602] by [@jsuereth][@jsuereth] diff --git a/project/Util.scala b/project/Util.scala index 6c9ed8754..87b1f5a4a 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-14d4d23e25f354cd296c73bfff405544434d5f80") + lazy val ivy = lib("org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-ba72610c018ef6b640551964f61d79a480b4c4e4") 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"