From 239e9198c729165a8f3e00da2a069f963b5eab93 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 18 Dec 2009 09:46:04 -0500 Subject: [PATCH] Bump to Ivy 2.1.0, don't print stack trace for retrieve exceptions --- launch/Boot.scala | 1 + project/build/XSbt.scala | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/launch/Boot.scala b/launch/Boot.scala index 81bba43d7..785c30a69 100644 --- a/launch/Boot.scala +++ b/launch/Boot.scala @@ -16,6 +16,7 @@ object Boot catch { case b: BootException => errorAndExit(b.toString) + case r: xsbti.RetrieveException =>errorAndExit("Error: " + r.getMessage) case e => e.printStackTrace errorAndExit(Pre.prefixError(e.toString)) diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala index ae301db3e..3501f7aa7 100644 --- a/project/build/XSbt.scala +++ b/project/build/XSbt.scala @@ -62,7 +62,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) def compilerInterfaceClasspath = compileInterfaceSub.projectClasspath(Configurations.Test) //run in parallel - override def parallelExecution = true + override def parallelExecution = false override def managedStyle = ManagedStyle.Ivy val publishTo = Resolver.file("test-repo", new File("/var/dbwww/repo/")) @@ -117,7 +117,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) } class IvyProject(info: ProjectInfo) extends Base(info) with TestWithIO with TestWithLog with TestWithLaunch { - val ivy = "org.apache.ivy" % "ivy" % "2.0.0" + val ivy = "org.apache.ivy" % "ivy" % "2.1.0" override def deliverProjectDependencies = Set(super.deliverProjectDependencies.toSeq : _*) - launchInterfaceSub.projectID } abstract class BaseInterfaceProject(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with TestWithLog with Component with JavaProject