From a1e26ca6616621bea3c0d63990a9b5b553f39b1e Mon Sep 17 00:00:00 2001 From: Roberto Tyley Date: Sun, 3 Aug 2014 09:11:56 +0100 Subject: [PATCH] Use HTTPS for downloading artifacts from Maven Central Sonatype have enabled HTTPS access for Maven Central: http://central.sonatype.org/articles/2014/Aug/03/https-support-launching-now/ Note that the Ivy class IBiblioResolver contains the old http url (ie DEFAULT_M2_ROOT="http://repo1.maven.org/maven2/"): http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java?revision=1557968&view=markup#l72 --- ivy/src/main/scala/sbt/Resolver.scala | 5 +++-- src/sphinx/Detailed-Topics/Resolvers.rst | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index b9b715d0c..74404960a 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -6,7 +6,7 @@ package sbt import java.io.File import java.net.URL import scala.xml.NodeSeq -import org.apache.ivy.plugins.resolver.{ DependencyResolver, IBiblioResolver } +import org.apache.ivy.plugins.resolver.DependencyResolver sealed trait Resolver { def name: String @@ -135,7 +135,7 @@ final case class SftpRepository(name: String, connection: SshConnection, pattern import Resolver._ -object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT) +object DefaultMavenRepository extends MavenRepository("public", DefaultMavenRepositoryRoot) object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot) object JavaNet1Repository extends JavaNet1Repository sealed trait JavaNet1Repository extends Resolver { @@ -146,6 +146,7 @@ object Resolver { val TypesafeRepositoryRoot = "http://repo.typesafe.com/typesafe" val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt" val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories" + val DefaultMavenRepositoryRoot = "https://repo1.maven.org/maven2/" // obsolete: kept only for launcher compatibility private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases" diff --git a/src/sphinx/Detailed-Topics/Resolvers.rst b/src/sphinx/Detailed-Topics/Resolvers.rst index 66f5132e9..38165b230 100644 --- a/src/sphinx/Detailed-Topics/Resolvers.rst +++ b/src/sphinx/Detailed-Topics/Resolvers.rst @@ -21,7 +21,7 @@ Predefined A few predefined repositories are available and are listed below - `DefaultMavenRepository` This is the main Maven repository at - http://repo1.maven.org/maven2/ and is included by default + https://repo1.maven.org/maven2/ and is included by default - `JavaNet1Repository` This is the Maven 1 repository at http://download.java.net/maven/1/