Skip to content

Commit

Permalink
fix dep-mgmt tests
Browse files Browse the repository at this point in the history
  • Loading branch information
harrah committed May 5, 2012
1 parent 152a50a commit bf7e361
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ object MakePomTest extends Build
readPom <<= makePom map XML.loadFile,
TaskKey[Unit]("check-pom") <<= checkPom,
TaskKey[Unit]("check-extra") <<= checkExtra,
resolvers ++= Seq(ScalaToolsReleases, ScalaToolsSnapshots),
makePomConfiguration ~= { _.copy(extra = <extra-tag/>) }
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
object PomRepoTest extends Build
{
lazy val root = Project("root", file(".")) settings(
resolvers ++= Seq(local, ScalaToolsSnapshots),
resolvers ++= Seq(local, ScalaToolsReleases, ScalaToolsSnapshots),
InputKey[Unit]("check-pom") <<= InputTask(_ => spaceDelimited("<args>")) { result => (makePom, result, streams) map checkPomRepositories },
makePomConfiguration <<= (makePomConfiguration, baseDirectory) { (conf, base) =>
conf.copy(filterRepositories = pomIncludeRepository(base, conf.filterRepositories) )
Expand Down
4 changes: 2 additions & 2 deletions sbt/src/sbt-test/dependency-management/pom-advanced/test
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# write the default pom. The only repositories should be Scala Tools Releases and Snapshots
> check-pom http://scala-tools.org/repo-releases/ http://scala-tools.org/repo-snapshots/
> check-pom https://oss.sonatype.org/content/repositories/releases/ https://oss.sonatype.org/content/repositories/snapshots/

# include file:// repositories. The generated repositories section should include the local Maven repository as well
$ touch repo.all
> check-pom http://scala-tools.org/repo-releases/ http://scala-tools.org/repo-snapshots/ file://*.m2/repository/
> check-pom https://oss.sonatype.org/content/repositories/releases/ https://oss.sonatype.org/content/repositories/snapshots/ file://*.m2/repository/

# include file:// repositories. The generated repositories section should include the local Maven repository as well
$ delete repo.all
Expand Down

0 comments on commit bf7e361

Please sign in to comment.