diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 3ee0044fd..d0a768ae2 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3785,7 +3785,8 @@ object Classpaths { private[this] def bootRepository(repo: xsbti.Repository): Resolver = { import xsbti.Predefined repo match { - case m: xsbti.MavenRepository => MavenRepository(m.id, m.url.toString) + case m: xsbti.MavenRepository => + MavenRepository(m.id, m.url.toString).withAllowInsecureProtocol(m.allowInsecureProtocol) case i: xsbti.IvyRepository => val patterns = Patterns( Vector(i.ivyPattern), @@ -3799,7 +3800,8 @@ object Classpaths { // This hackery is to deal suitably with UNC paths on Windows. Once we can assume Java7, Paths should save us from this. val file = IO.toFile(i.url) Resolver.file(i.id, file)(patterns) - case _ => Resolver.url(i.id, i.url)(patterns) + case _ => + Resolver.url(i.id, i.url)(patterns).withAllowInsecureProtocol(i.allowInsecureProtocol) } case p: xsbti.PredefinedRepository => p.id match { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 03794da03..c6d3e4167 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -21,7 +21,7 @@ object Dependencies { private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion - val launcherVersion = "1.1.3" + val launcherVersion = "1.1.4" val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion val testInterface = "org.scala-sbt" % "test-interface" % "1.0" diff --git a/sbt/src/test/scala/sbt/internal/scriptedtest/ScriptedLauncher.java b/sbt/src/test/scala/sbt/internal/scriptedtest/ScriptedLauncher.java index fa4ef4efd..a2710c66d 100644 --- a/sbt/src/test/scala/sbt/internal/scriptedtest/ScriptedLauncher.java +++ b/sbt/src/test/scala/sbt/internal/scriptedtest/ScriptedLauncher.java @@ -560,6 +560,11 @@ public class ScriptedLauncher { return id; } + @Override + public boolean allowInsecureProtocol() { + return false; + } + @Override public URL url() { try {