From 0a4cb0efba874c1df2dcb313adc837ec46860998 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Fri, 29 Jul 2011 00:09:21 +0530
Subject: [PATCH 1/3] fix distribution method (see:
 http://maven.apache.org/pom.html#Licenses)

---
 ivy/MakePom.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala
index 64145e066..f8f3da374 100644
--- a/ivy/MakePom.scala
+++ b/ivy/MakePom.scala
@@ -78,7 +78,7 @@ class MakePom
 		<license>
 			<name>{l.getName}</name>
 			<url>{l.getUrl}</url>
-			<distribution>jar</distribution>
+			<distribution>repo</distribution>
 		</license>
 	def homePage(homePage: String) = if(homePage eq null) NodeSeq.Empty else <url>{homePage}</url>
 	def revision(version: String) = if(version ne null) <version>{version}</version> else NodeSeq.Empty

From 5e002782f17e215648945ee6f1b3eba77f82cda4 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Fri, 29 Jul 2011 23:02:45 +0530
Subject: [PATCH 2/3] Add java.net M2 repo for convenience

---
 ivy/IvyInterface.scala | 3 +++
 1 file changed, 3 insertions(+)

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] =

From 60aa517cd2d7104fbb21e36c0aa5c7849a3a66d1 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Sat, 30 Jul 2011 01:52:02 +0530
Subject: [PATCH 3/3] JavaNet1Repository should have legacy layout (see:
 http://maven.apache.org/pom.html#Repository)

---
 ivy/MakePom.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala
index f8f3da374..361520698 100644
--- a/ivy/MakePom.scala
+++ b/ivy/MakePom.scala
@@ -173,6 +173,7 @@ class MakePom
 			<id>{id}</id>
 			<name>{name}</name>
 			<url>{root}</url>
+			<layout>{ if(name == JavaNet1Repository.name) "legacy" else "default" }</layout>
 		</repository>
 
 	/** Retain dependencies only with the configurations given, or all public configurations of `module` if `configurations` is None.