From e85836d7ccd79fbfe00dd3e15b5baf6ad52d9b32 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 18 Jun 2012 08:18:39 -0400
Subject: [PATCH] fix ivy-settings-a test

---
 .../sbt-test/dependency-management/ivy-settings-a/build.sbt   | 2 +-
 .../ivy-settings-a/changes/scala-tools-ivysettings.xml        | 4 +---
 .../ivy-settings-a/changes/scalacheck-ivy.xml                 | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
index 7d4ed2d02..daa21c77d 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
@@ -1,6 +1,6 @@
 seq(externalIvySettings(), externalIvyFile())
 
 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")
 }
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
index ea1584c39..f986ef4ce 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
@@ -8,12 +8,10 @@
 	
 	<caches defaultCacheDir="${ivy.settings.dir}/target/cache"/>
 	<resolvers>
-		<ibiblio name="scala-tools" m2compatible="true" root="http://scala-tools.org/repo-releases/"/>
 		<chain name="test-chain" returnFirst="true" checkmodified="true">
 			<resolver ref="local"/>
 			<resolver ref="shared"/>
 			<resolver ref="main"/>
-			<resolver ref="scala-tools"/>
 		</chain>
 	</resolvers>
-</ivysettings> 
\ No newline at end of file
+</ivysettings> 
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
index a26af7cf0..0eea774cf 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
@@ -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">
 	<info organisation="org" module="ivy-settings-test"/>
 	<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>
-</ivy-module>
\ No newline at end of file
+</ivy-module>