luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1602 from sbt/wip/ivy-no-commons-httpclient 

Bump to a version of ivy that will not swap in httpclient URL handler.
This commit is contained in:
eugene yokota 2014-09-17 10:29:06 -04:00
parent 920c875e12 619536b059
commit dc077c27ed
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
notes/0.13.7/ivy-no-httpclient.md Normal file
View File

@ -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]

2
project/Util.scala
View File

@ -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"