diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala index 3c80bc087..3631bbef0 100644 --- a/ivy/IvyInterface.scala +++ b/ivy/IvyInterface.scala @@ -159,6 +159,7 @@ import Resolver._ object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot) 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 sealed trait JavaNet1Repository extends Resolver { @@ -171,6 +172,8 @@ object Resolver val ScalaToolsSnapshotsName = "Scala-Tools Maven2 Snapshots Repository" val ScalaToolsReleasesRoot = "http://scala-tools.org/repo-releases" val ScalaToolsSnapshotsRoot = "http://scala-tools.org/repo-snapshots" + val JavaNet2RepositoryName = "java.net Maven2 Repository" + val JavaNet2RepositoryRoot = "http://download.java.net/maven/2" /** Add the local, Maven Central, and Scala Tools releases repositories to the user repositories. */ def withDefaultResolvers(userResolvers: Seq[Resolver]): Seq[Resolver] = diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala index 64145e066..361520698 100644 --- a/ivy/MakePom.scala +++ b/ivy/MakePom.scala @@ -78,7 +78,7 @@ class MakePom {l.getName} {l.getUrl} - jar + repo def homePage(homePage: String) = if(homePage eq null) NodeSeq.Empty else {homePage} def revision(version: String) = if(version ne null) {version} else NodeSeq.Empty @@ -173,6 +173,7 @@ class MakePom {id} {name} {root} + { if(name == JavaNet1Repository.name) "legacy" else "default" } /** Retain dependencies only with the configurations given, or all public configurations of `module` if `configurations` is None.