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

Merge pull request #1548 from sbt/fix/1541 

HTTPS: Various HTTPS related changes
This commit is contained in:
eugene yokota 2014-08-23 23:32:19 -04:00
parent 18597ac93a 090e3a6468
commit 34ef2d2dd7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/src/main/scala/sbt/ConvertResolver.scala
View File

@ -112,6 +112,8 @@ private object ConvertResolver {
resolver.setPatterns() // has to be done after initializeMavenStyle, which calls methods that overwrite the patterns resolver.setPatterns() // has to be done after initializeMavenStyle, which calls methods that overwrite the patterns
resolver resolver
} }
// TODO: HTTP repository is no longer recommended. #1541
// Remove `JavaNet1Repository` when we bump up the API.
case r: JavaNet1Repository => case r: JavaNet1Repository =>
{ {
// Thanks to Matthias Pfau for posting how to use the Maven 1 repository on java.net with Ivy: // Thanks to Matthias Pfau for posting how to use the Maven 1 repository on java.net with Ivy:

13
ivy/src/main/scala/sbt/Resolver.scala
View File

@ -138,7 +138,9 @@ import Resolver._
object DefaultMavenRepository extends MavenRepository("public", centralRepositoryRoot(useSecureResolvers)) object DefaultMavenRepository extends MavenRepository("public", centralRepositoryRoot(useSecureResolvers))
object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot) object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot)
object JCenterRepository extends MavenRepository(JCenterRepositoryName, JCenterRepositoryRoot) object JCenterRepository extends MavenRepository(JCenterRepositoryName, JCenterRepositoryRoot)
@deprecated("HTTP repository is no longer recommended.", "0.13.6")
object JavaNet1Repository extends JavaNet1Repository object JavaNet1Repository extends JavaNet1Repository
@deprecated("HTTP repository is no longer recommended.", "0.13.6")
sealed trait JavaNet1Repository extends Resolver { sealed trait JavaNet1Repository extends Resolver {
def name = "java.net Maven1 Repository" def name = "java.net Maven1 Repository"
} }
@ -146,15 +148,22 @@ sealed trait JavaNet1Repository extends Resolver {
object Resolver { object Resolver {
private[sbt] def useSecureResolvers = sys.props.get("sbt.repository.secure") map { _.toLowerCase == "true" } getOrElse true private[sbt] def useSecureResolvers = sys.props.get("sbt.repository.secure") map { _.toLowerCase == "true" } getOrElse true
val TypesafeRepositoryRoot = "http://repo.typesafe.com/typesafe" val TypesafeRepositoryRoot = typesafeRepositoryRoot(useSecureResolvers)
val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt" val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt"
val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories" val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories"
val JavaNet2RepositoryName = "java.net Maven2 Repository" val JavaNet2RepositoryName = "java.net Maven2 Repository"
val JavaNet2RepositoryRoot = "http://download.java.net/maven/2" val JavaNet2RepositoryRoot = javanet2RepositoryRoot(useSecureResolvers)
val JCenterRepositoryName = "jcenter" val JCenterRepositoryName = "jcenter"
val JCenterRepositoryRoot = "https://jcenter.bintray.com/" val JCenterRepositoryRoot = "https://jcenter.bintray.com/"
val DefaultMavenRepositoryRoot = "https://repo1.maven.org/maven2/" val DefaultMavenRepositoryRoot = "https://repo1.maven.org/maven2/"
// TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future.
private[sbt] def centralRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo1.maven.org/maven2/" private[sbt] def centralRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo1.maven.org/maven2/"
// TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future.
private[sbt] def javanet2RepositoryRoot(secure: Boolean) =
if (secure) "https://maven.java.net/content/repositories/public/"
else "http://download.java.net/maven/2"
// TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future.
private[sbt] def typesafeRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo.typesafe.com/typesafe"
// obsolete: kept only for launcher compatibility // obsolete: kept only for launcher compatibility
private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases" private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases"