From 1488bf2eff4344e6b3ac3fb5419277db9f020bfd Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 27 May 2012 20:03:08 -0400 Subject: [PATCH] restore scala-tools-* repository names in launcher as aliases to sonatype-oss-* --- launch/Update.scala | 4 ++-- launch/interface/src/main/java/xsbti/Predefined.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/launch/Update.scala b/launch/Update.scala index ca2fa6170..e88b24318 100644 --- a/launch/Update.scala +++ b/launch/Update.scala @@ -296,8 +296,8 @@ final class Update(config: UpdateConfiguration) case Local => localResolver(settings.getDefaultIvyUserDir.getAbsolutePath) case MavenLocal => mavenLocal case MavenCentral => mavenMainResolver - case ScalaToolsReleases => mavenResolver("Sonatype Releases Repository", "https://oss.sonatype.org/content/repositories/releases") - case ScalaToolsSnapshots => scalaSnapshots(getScalaVersion) + case ScalaToolsReleases | SonatypeOSSReleases => mavenResolver("Sonatype Releases Repository", "https://oss.sonatype.org/content/repositories/releases") + case ScalaToolsSnapshots | SonatypeOSSSnapshots => scalaSnapshots(getScalaVersion) } } } diff --git a/launch/interface/src/main/java/xsbti/Predefined.java b/launch/interface/src/main/java/xsbti/Predefined.java index 9c2ff6593..1d6cf65ec 100644 --- a/launch/interface/src/main/java/xsbti/Predefined.java +++ b/launch/interface/src/main/java/xsbti/Predefined.java @@ -5,8 +5,10 @@ public enum Predefined Local("local"), MavenLocal("maven-local"), MavenCentral("maven-central"), - ScalaToolsReleases("sonatype-oss-releases"), - ScalaToolsSnapshots("sonatype-oss-snapshots"); + ScalaToolsReleases("scala-tools-releases"), + ScalaToolsSnapshots("scala-tools-snapshots"), + SonatypeOSSReleases("sonatype-oss-releases"), + SonatypeOSSSnapshots("sonatype-oss-snapshots"); private final String label; private Predefined(String label) { this.label = label; }