From 141d608ed73ec09a6021b581b4a0605aecca321e Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 19 Jun 2013 17:13:32 -0400 Subject: [PATCH] Move deprecated scala-tools conveniences to private[sbt] accessibility --- ivy/src/main/scala/sbt/Resolver.scala | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index 82aea65d4..fb122d0bc 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -135,10 +135,7 @@ final case class SftpRepository(name: String, connection: SshConnection, pattern } import Resolver._ -@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") -object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot) -@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") -object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot) + object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT) object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot) object JavaNet1Repository extends JavaNet1Repository @@ -152,14 +149,15 @@ object Resolver val TypesafeRepositoryRoot = "http://repo.typesafe.com/typesafe" 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 = "Sonatype OSS Releases" - @deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") - 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 = SonatypeRepositoryRoot + "/releases" - @deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3") - val ScalaToolsSnapshotsRoot = SonatypeRepositoryRoot + "/snapshots" + + // obsolete: kept only for launcher compatibility + private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases" + private[sbt] val ScalaToolsSnapshotsName = "Sonatype OSS Snapshots" + private[sbt] val ScalaToolsReleasesRoot = SonatypeRepositoryRoot + "/releases" + private[sbt] val ScalaToolsSnapshotsRoot = SonatypeRepositoryRoot + "/snapshots" + private[sbt] val ScalaToolsReleases = new MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot) + private[sbt] val ScalaToolsSnapshots = new MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot) + val JavaNet2RepositoryName = "java.net Maven2 Repository" val JavaNet2RepositoryRoot = "http://download.java.net/maven/2"