luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139 from indrajitr/pom-enhancement 

Fixes for generated pom
This commit is contained in:
Mark Harrah 2011-07-31 12:28:09 -07:00
parent d7a5dca812 6dca8bda66
commit 992719445c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ivy/IvyInterface.scala
View File

@ -159,6 +159,7 @@ import Resolver._
object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot) object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot)
object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot) object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot)
object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT) object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT)
object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot)
object JavaNet1Repository extends JavaNet1Repository object JavaNet1Repository extends JavaNet1Repository
sealed trait JavaNet1Repository extends Resolver sealed trait JavaNet1Repository extends Resolver
{ {
@ -171,6 +172,8 @@ object Resolver
val ScalaToolsSnapshotsName = "Scala-Tools Maven2 Snapshots Repository" val ScalaToolsSnapshotsName = "Scala-Tools Maven2 Snapshots Repository"
val ScalaToolsReleasesRoot = "http://scala-tools.org/repo-releases" val ScalaToolsReleasesRoot = "http://scala-tools.org/repo-releases"
val ScalaToolsSnapshotsRoot = "http://scala-tools.org/repo-snapshots" 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. */ /** Add the local, Maven Central, and Scala Tools releases repositories to the user repositories. */
def withDefaultResolvers(userResolvers: Seq[Resolver]): Seq[Resolver] = def withDefaultResolvers(userResolvers: Seq[Resolver]): Seq[Resolver] =

3
ivy/MakePom.scala
View File

@ -78,7 +78,7 @@ class MakePom
<license> <license>
<name>{l.getName}</name> <name>{l.getName}</name>
<url>{l.getUrl}</url> <url>{l.getUrl}</url>
<distribution>jar</distribution> <distribution>repo</distribution>
</license> </license>
def homePage(homePage: String) = if(homePage eq null) NodeSeq.Empty else <url>{homePage}</url> 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 def revision(version: String) = if(version ne null) <version>{version}</version> else NodeSeq.Empty
@ -173,6 +173,7 @@ class MakePom
<id>{id}</id> <id>{id}</id>
<name>{name}</name> <name>{name}</name>
<url>{root}</url> <url>{root}</url>
<layout>{ if(name == JavaNet1Repository.name) "legacy" else "default" }</layout>
</repository> </repository>
/** Retain dependencies only with the configurations given, or all public configurations of `module` if `configurations` is None. /** Retain dependencies only with the configurations given, or all public configurations of `module` if `configurations` is None.