From c648a31c59b542f3c679a04cb7d46d8bff4cb0df Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Aug 2014 05:16:34 -0400 Subject: [PATCH] #1541. Launcher uses HTTPS Maven Central by default --- launch/src/main/scala/xsbt/boot/Update.scala | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/launch/src/main/scala/xsbt/boot/Update.scala b/launch/src/main/scala/xsbt/boot/Update.scala index 5c8492cae..c856562b0 100644 --- a/launch/src/main/scala/xsbt/boot/Update.scala +++ b/launch/src/main/scala/xsbt/boot/Update.scala @@ -344,20 +344,20 @@ final class Update(config: UpdateConfiguration) { /** Creates a maven-style resolver.*/ private def mavenResolver(name: String, root: String) = { - val resolver = defaultMavenResolver(name) + val resolver = new IBiblioResolver + resolver.setName(name) + resolver.setM2compatible(true) resolver.setRoot(root) resolver } + private def useSecureResolvers = sys.props.get("sbt.repository.secure") map { _.toLowerCase == "true" } getOrElse true + private def centralRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo1.maven.org/maven2/" + /** Creates a resolver for Maven Central.*/ private def mavenMainResolver = defaultMavenResolver("Maven Central") /** Creates a maven-style resolver with the default root.*/ private def defaultMavenResolver(name: String) = - { - val resolver = new IBiblioResolver - resolver.setName(name) - resolver.setM2compatible(true) - resolver - } + mavenResolver(name, centralRepositoryRoot(useSecureResolvers)) private def localResolver(ivyUserDirectory: String) = { val localIvyRoot = ivyUserDirectory + "/local"