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

fix ivy-settings-a test

This commit is contained in:
Mark Harrah 2012-06-18 08:18:39 -04:00
parent 5539693cc3
commit e85836d7cc
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
View File

@ -1,6 +1,6 @@
seq(externalIvySettings(), externalIvyFile()) seq(externalIvySettings(), externalIvyFile())
TaskKey[Unit]("check") <<= (baseDirectory, update) map { (base, report) => TaskKey[Unit]("check") <<= (baseDirectory, update) map { (base, report) =>
val files = report.matching( moduleFilter(organization = "org.scala-tools.testing", name = "scalacheck*", revision = "1.9") ) val files = report.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck*", revision = "1.9") )
assert(!files.isEmpty, "ScalaCheck module not found in update report") assert(!files.isEmpty, "ScalaCheck module not found in update report")
} }

2
sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
View File

@ -8,12 +8,10 @@
<caches defaultCacheDir="${ivy.settings.dir}/target/cache"/> <caches defaultCacheDir="${ivy.settings.dir}/target/cache"/>
<resolvers> <resolvers>
<ibiblio name="scala-tools" m2compatible="true" root="http://scala-tools.org/repo-releases/"/>
<chain name="test-chain" returnFirst="true" checkmodified="true"> <chain name="test-chain" returnFirst="true" checkmodified="true">
<resolver ref="local"/> <resolver ref="local"/>
<resolver ref="shared"/> <resolver ref="shared"/>
<resolver ref="main"/> <resolver ref="main"/>
<resolver ref="scala-tools"/>
</chain> </chain>
</resolvers> </resolvers>
</ivysettings> </ivysettings>

2
sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
View File

@ -2,6 +2,6 @@
<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd"> <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org" module="ivy-settings-test"/> <info organisation="org" module="ivy-settings-test"/>
<dependencies> <dependencies>
<dependency org="org.scala-tools.testing" name="scalacheck_2.9.1" rev="1.9"/> <dependency org="org.scalacheck" name="scalacheck_2.9.1" rev="1.9"/>
</dependencies> </dependencies>
</ivy-module> </ivy-module>