From c427c3e503d88b8272221aaf34818bd12485469c Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 16 May 2011 22:56:07 -0400 Subject: [PATCH] use shorter name for repository --- launch/src/main/resources/sbt/sbt.boot.properties | 2 +- main/Defaults.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/launch/src/main/resources/sbt/sbt.boot.properties b/launch/src/main/resources/sbt/sbt.boot.properties index 7bc031067..193a6cd0c 100644 --- a/launch/src/main/resources/sbt/sbt.boot.properties +++ b/launch/src/main/resources/sbt/sbt.boot.properties @@ -12,7 +12,7 @@ [repositories] local maven-local - typesafe-ivy-releases: http://typesafe.artifactoryonline.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] + typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] maven-central scala-tools-releases scala-tools-snapshots diff --git a/main/Defaults.scala b/main/Defaults.scala index 847d5e4be..b75c3d5c6 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -610,7 +610,7 @@ object Classpaths updateSbtClassifiers <<= (ivySbt, projectID, transitiveClassifiers, updateConfiguration, sbtDependency, ivyScala, streams) map { (is, pid, classifiers, c, sbtDep, ivyScala, s) => IvyActions.transitiveScratch(is, pid, "sbt", sbtDep :: Nil, classifiers, c, ivyScala, s.log) }, - sbtResolver in GlobalScope :== dbResolver, + sbtResolver in GlobalScope :== typesafeResolver, sbtDependency in GlobalScope <<= appConfiguration { app => val id = app.provider.id ModuleID(id.groupID, id.name, id.version, crossVersion = id.crossVersioned) @@ -796,7 +796,7 @@ object Classpaths flatten(defaultConfiguration in p get data) getOrElse Configurations.Default def flatten[T](o: Option[Option[T]]): Option[T] = o flatMap idFun - lazy val dbResolver = Resolver.url("sbt-db", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns) + lazy val typesafeResolver = Resolver.url("typesafe-ivy-releases", new URL("http://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns) import DependencyFilter._ def managedJars(config: Configuration, jarTypes: Set[String], up: UpdateReport): Classpath = up.select( configuration = configurationFilter(config.name), artifact = artifactFilter(`type` = jarTypes) )