Permalink
Browse files

more scala-tools replacements

  • Loading branch information...
1 parent 97ddd10 commit 3b200a0113486f917c5b7b1342166fbe78165a5f @harrah committed May 5, 2012
Showing with 7 additions and 7 deletions.
  1. +5 −5 launch/Update.scala
  2. +2 −2 launch/interface/src/main/java/xsbti/Predefined.java
View
@@ -218,7 +218,7 @@ final class Update(config: UpdateConfiguration)
retrieveEngine.retrieve(module.getModuleRevisionId, baseDirectoryName(scalaVersion) + "/" + pattern, retrieveOptions)
}
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)
{
val newDefault = new ChainResolver {
@@ -265,7 +265,7 @@ final class Update(config: UpdateConfiguration)
case Local => localResolver(settings.getDefaultIvyUserDir.getAbsolutePath)
case MavenLocal => mavenLocal
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(scalaVersion)
}
}
@@ -323,16 +323,16 @@ final class Update(config: UpdateConfiguration)
if(m.matches)
{
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
- resolver.setName("Scala Tools Snapshots")
+ resolver.setName("Sonatype OSS Snapshots")
resolver.setM2compatible(true)
resolver.addArtifactPattern(pattern)
resolver
}
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) =
{
@@ -5,8 +5,8 @@
Local("local"),
MavenLocal("maven-local"),
MavenCentral("maven-central"),
- ScalaToolsReleases("scala-tools-releases"),
- ScalaToolsSnapshots("scala-tools-snapshots");
+ ScalaToolsReleases("sonatype-oss-releases"),
+ ScalaToolsSnapshots("sonatype-oss-snapshots");
private final String label;
private Predefined(String label) { this.label = label; }

0 comments on commit 3b200a0

Please sign in to comment.