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

Merge pull request #1536 from benmccann/typesafe-https 

Fetch typesafe artifacts using https
This commit is contained in:
eugene yokota 2014-08-22 02:48:59 -04:00
parent c69b0066af 6508429d81
commit 8af683a1f8
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launch/src/main/resources/sbt.boot.properties0.10.0
View File

@ -11,7 +11,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central maven-central
sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots

2
launch/src/main/resources/sbt.boot.properties0.10.1
View File

@ -11,7 +11,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central maven-central
sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots

2
launch/src/main/resources/sbt.boot.properties0.11.0
View File

@ -11,7 +11,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central maven-central
sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots

2
launch/src/main/resources/sbt.boot.properties0.11.1
View File

@ -11,7 +11,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central maven-central
sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots

2
launch/src/main/resources/sbt.boot.properties0.11.2
View File

@ -11,7 +11,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central maven-central
sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots

2
launch/src/main/resources/sbt.boot.properties0.11.3
View File

@ -11,7 +11,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central maven-central
sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots

2
project/Transform.scala
View File

@ -92,5 +92,5 @@ object Transform {
lazy val Releases = typesafeRepository("releases") lazy val Releases = typesafeRepository("releases")
lazy val Snapshots = typesafeRepository("snapshots") lazy val Snapshots = typesafeRepository("snapshots")
def typesafeRepository(status: String) = def typesafeRepository(status: String) =
""" typesafe-ivy-%s: http://repo.typesafe.com/typesafe/ivy-%<s/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly""" format status """ typesafe-ivy-%s: https://repo.typesafe.com/typesafe/ivy-%<s/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly""" format status
} }

2
sbt/src/sbt-test/dependency-management/module-confs/Test.sbt
View File

@ -1,5 +1,5 @@
{ {
def snapshotPattern = "http://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.0-SNAPSHOT/[artifact]-[revision].[ext]" def snapshotPattern = "https://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.0-SNAPSHOT/[artifact]-[revision].[ext]"
def scalaSnapshots = Resolver.url("Scala Tools Snapshots (Typesafe)") ivys(snapshotPattern) artifacts(snapshotPattern) mavenStyle() def scalaSnapshots = Resolver.url("Scala Tools Snapshots (Typesafe)") ivys(snapshotPattern) artifacts(snapshotPattern) mavenStyle()
moduleConfigurations += ModuleConfiguration("org.scala-lang", "*", "2.10.0-.*", scalaSnapshots) moduleConfigurations += ModuleConfiguration("org.scala-lang", "*", "2.10.0-.*", scalaSnapshots)
} }

2
sbt/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.sbt
View File

@ -1,5 +1,5 @@
{ {
def snapshotPattern = "http://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.0-SNAPSHOT/[artifact]-[revision].[ext]" def snapshotPattern = "https://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.0-SNAPSHOT/[artifact]-[revision].[ext]"
def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle() def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
moduleConfigurations += ModuleConfiguration("org.not-scala-lang", "*", "2.10.0-.*", scalaSnapshots) moduleConfigurations += ModuleConfiguration("org.not-scala-lang", "*", "2.10.0-.*", scalaSnapshots)
} }

2
sbt/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.sbt
View File

@ -1,5 +1,5 @@
{ {
def snapshotPattern = "http://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.a-SNAPSHOT/[artifact]-[revision].[ext]" def snapshotPattern = "https://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.a-SNAPSHOT/[artifact]-[revision].[ext]"
def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle() def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
moduleConfigurations += ModuleConfiguration("org.scala-lang", "*", "2.10.0-.*", scalaSnapshots) moduleConfigurations += ModuleConfiguration("org.scala-lang", "*", "2.10.0-.*", scalaSnapshots)
} }

2
sbt/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.sbt
View File

@ -1,5 +1,5 @@
{ {
def snapshotPattern = "http://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.0-SNAPSHOT/[artifact]-[revision].[ext]" def snapshotPattern = "https://repo.typesafe.com/typesafe/scala-tools-snapshots/[organization]/[module]/2.10.0-SNAPSHOT/[artifact]-[revision].[ext]"
def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle() def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
moduleConfigurations += ModuleConfiguration("org.scala-lang", "*", "2.10.0-.*", scalaSnapshots) moduleConfigurations += ModuleConfiguration("org.scala-lang", "*", "2.10.0-.*", scalaSnapshots)
} }

2
src/main/conscript/sbt/launchconfig
View File

@ -12,7 +12,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
maven-central maven-central
[boot] [boot]

2
src/main/conscript/scalas/launchconfig
View File

@ -12,7 +12,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
maven-central maven-central
[boot] [boot]

2
src/main/conscript/screpl/launchconfig
View File

@ -12,7 +12,7 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
maven-central maven-central
[boot] [boot]