From 3d1766a96e3e9b40930ab426496dab4c2c12f817 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 2 May 2012 19:56:35 -0400 Subject: [PATCH] bump to Ivy 2.3.0-RC1 --- ivy/CustomXmlParser.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ivy/CustomXmlParser.scala b/ivy/CustomXmlParser.scala index f773b1ce9..da44743f6 100644 --- a/ivy/CustomXmlParser.scala +++ b/ivy/CustomXmlParser.scala @@ -19,8 +19,6 @@ private[sbt] object CustomXmlParser extends XmlModuleDescriptorParser import XmlModuleDescriptorParser.Parser class CustomParser(settings: IvySettings, defaultConfig: Option[String]) extends Parser(CustomXmlParser, settings) { - if(defaultConfig.isDefined) setDefaultConfMapping("*->default(compile)") - def setSource(url: URL) = { super.setResource(new URLResource(url)) @@ -29,7 +27,11 @@ private[sbt] object CustomXmlParser extends XmlModuleDescriptorParser def setInput(bytes: Array[Byte]) { setInput(new ByteArrayInputStream(bytes)) } /** Overridden because the super implementation overwrites the module descriptor.*/ override def setResource(res: Resource) {} - override def setMd(md: DefaultModuleDescriptor) = super.setMd(md) + override def setMd(md: DefaultModuleDescriptor) = + { + super.setMd(md) + if(defaultConfig.isDefined) setDefaultConfMapping("*->default(compile)") + } override def parseDepsConfs(confs: String, dd: DefaultDependencyDescriptor) = super.parseDepsConfs(confs, dd) override def getDefaultConf = defaultConfig.getOrElse(super.getDefaultConf) }