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

#1541. Launcher uses HTTPS Maven Central by default

This commit is contained in:
Eugene Yokota 2014-08-22 05:16:34 -04:00
parent 631ec5134f
commit c648a31c59
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
launch/src/main/scala/xsbt/boot/Update.scala
View File

@ -344,20 +344,20 @@ final class Update(config: UpdateConfiguration) {
/** Creates a maven-style resolver.*/ /** Creates a maven-style resolver.*/
private def mavenResolver(name: String, root: String) = 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.setRoot(root)
resolver 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.*/ /** Creates a resolver for Maven Central.*/
private def mavenMainResolver = defaultMavenResolver("Maven Central") private def mavenMainResolver = defaultMavenResolver("Maven Central")
/** Creates a maven-style resolver with the default root.*/ /** Creates a maven-style resolver with the default root.*/
private def defaultMavenResolver(name: String) = private def defaultMavenResolver(name: String) =
{ mavenResolver(name, centralRepositoryRoot(useSecureResolvers))
val resolver = new IBiblioResolver
resolver.setName(name)
resolver.setM2compatible(true)
resolver
}
private def localResolver(ivyUserDirectory: String) = private def localResolver(ivyUserDirectory: String) =
{ {
val localIvyRoot = ivyUserDirectory + "/local" val localIvyRoot = ivyUserDirectory + "/local"