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

more scala-tools replacements

This commit is contained in:
Mark Harrah 2012-05-05 20:35:04 -04:00
parent 361027127e
commit e8b8be7547
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ivy/IvyInterface.scala
View File

@ -196,13 +196,13 @@ object Resolver
val SbtPluginRepositoryRoot = "http://scalasbt.artifactoryonline.com/scalasbt" val SbtPluginRepositoryRoot = "http://scalasbt.artifactoryonline.com/scalasbt"
val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories" val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") @deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsReleasesName = "Scala-Tools Maven2 Repository" val ScalaToolsReleasesName = "Sonatype OSS Releases"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") @deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsSnapshotsName = "Scala-Tools Maven2 Snapshots Repository" val ScalaToolsSnapshotsName = "Sonatype OSS Snapshots"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") @deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsReleasesRoot = "http://scala-tools.org/repo-releases" val ScalaToolsReleasesRoot = SonatypeRepositoryRoot + "/releases"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") @deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsSnapshotsRoot = "http://scala-tools.org/repo-snapshots" val ScalaToolsSnapshotsRoot = SonatypeRepositoryRoot + "/snapshots"
val JavaNet2RepositoryName = "java.net Maven2 Repository" val JavaNet2RepositoryName = "java.net Maven2 Repository"
val JavaNet2RepositoryRoot = "http://download.java.net/maven/2" val JavaNet2RepositoryRoot = "http://download.java.net/maven/2"

10
launch/Update.scala
View File

@ -249,7 +249,7 @@ final class Update(config: UpdateConfiguration)
case _ => true case _ => true
} }
private def retrieveType(tpe: String): Boolean = tpe == "jar" || tpe == "bundle" private def retrieveType(tpe: String): Boolean = tpe == "jar" || tpe == "bundle"
/** Add the scala tools repositories and a URL resolver to download sbt from the Google code project.*/ /** Add the Sonatype OSS repositories */
private def addResolvers(settings: IvySettings) private def addResolvers(settings: IvySettings)
{ {
val newDefault = new ChainResolver { val newDefault = new ChainResolver {
@ -296,7 +296,7 @@ final class Update(config: UpdateConfiguration)
case Local => localResolver(settings.getDefaultIvyUserDir.getAbsolutePath) case Local => localResolver(settings.getDefaultIvyUserDir.getAbsolutePath)
case MavenLocal => mavenLocal case MavenLocal => mavenLocal
case MavenCentral => mavenMainResolver case MavenCentral => mavenMainResolver
case ScalaToolsReleases => mavenResolver("Scala-Tools Maven2 Repository", "http://scala-tools.org/repo-releases") case ScalaToolsReleases => mavenResolver("Sonatype Releases Repository", "https://oss.sonatype.org/content/repositories/releases")
case ScalaToolsSnapshots => scalaSnapshots(getScalaVersion) case ScalaToolsSnapshots => scalaSnapshots(getScalaVersion)
} }
} }
@ -354,16 +354,16 @@ final class Update(config: UpdateConfiguration)
if(m.matches) if(m.matches)
{ {
val base = List(1,2,3).map(m.group).mkString(".") val base = List(1,2,3).map(m.group).mkString(".")
val pattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/" + base + "-SNAPSHOT/[artifact]-[revision](-[classifier]).[ext]" val pattern = "https://oss.sonatype.org/content/repositories/snapshots/[organization]/[module]/" + base + "-SNAPSHOT/[artifact]-[revision](-[classifier]).[ext]"
val resolver = new URLResolver val resolver = new URLResolver
resolver.setName("Scala Tools Snapshots") resolver.setName("Sonatype OSS Snapshots")
resolver.setM2compatible(true) resolver.setM2compatible(true)
resolver.addArtifactPattern(pattern) resolver.addArtifactPattern(pattern)
resolver resolver
} }
else else
mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots") mavenResolver("Sonatype Snapshots Repository", "https://oss.sonatype.org/content/repositories/snapshots")
} }
private def initializeBasic(resolver: BasicResolver) = private def initializeBasic(resolver: BasicResolver) =
{ {

4
launch/interface/src/main/java/xsbti/Predefined.java
View File

@ -5,8 +5,8 @@ public enum Predefined
Local("local"), Local("local"),
MavenLocal("maven-local"), MavenLocal("maven-local"),
MavenCentral("maven-central"), MavenCentral("maven-central"),
ScalaToolsReleases("scala-tools-releases"), ScalaToolsReleases("sonatype-oss-releases"),
ScalaToolsSnapshots("scala-tools-snapshots"); ScalaToolsSnapshots("sonatype-oss-snapshots");
private final String label; private final String label;
private Predefined(String label) { this.label = label; } private Predefined(String label) { this.label = label; }