From e8b8be754713be2c2200653ecb927226050c9ba9 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 5 May 2012 20:35:04 -0400 Subject: [PATCH] more scala-tools replacements --- ivy/IvyInterface.scala | 8 ++++---- launch/Update.scala | 10 +++++----- launch/interface/src/main/java/xsbti/Predefined.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala index 851aa271b..9a1708059 100644 --- a/ivy/IvyInterface.scala +++ b/ivy/IvyInterface.scala @@ -196,13 +196,13 @@ object Resolver val SbtPluginRepositoryRoot = "http://scalasbt.artifactoryonline.com/scalasbt" 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") - 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") - 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") - 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") - val ScalaToolsSnapshotsRoot = "http://scala-tools.org/repo-snapshots" + val ScalaToolsSnapshotsRoot = SonatypeRepositoryRoot + "/snapshots" val JavaNet2RepositoryName = "java.net Maven2 Repository" val JavaNet2RepositoryRoot = "http://download.java.net/maven/2" diff --git a/launch/Update.scala b/launch/Update.scala index c24c151d3..ca2fa6170 100644 --- a/launch/Update.scala +++ b/launch/Update.scala @@ -249,7 +249,7 @@ final class Update(config: UpdateConfiguration) case _ => true } 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 { @@ -296,7 +296,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(getScalaVersion) } } @@ -354,16 +354,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) = { diff --git a/launch/interface/src/main/java/xsbti/Predefined.java b/launch/interface/src/main/java/xsbti/Predefined.java index 3745313c1..9c2ff6593 100644 --- a/launch/interface/src/main/java/xsbti/Predefined.java +++ b/launch/interface/src/main/java/xsbti/Predefined.java @@ -5,8 +5,8 @@ public enum Predefined 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; }