--- a/buildframework/helium/config/ivy/ivy.xml	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/config/ivy/ivy.xml	Fri Aug 13 14:59:05 2010 +0300
@@ -35,35 +35,19 @@
     </info>
 
     <configurations>
-        <conf name="core" description="Core Helium tools from SymSEE."/>
+        <conf name="core" description="Helium libraries for SF and Nokia."/>
         <conf name="subcon" extends="core" description="Helium libraries for SF and Nokia."/>
         <conf name="core_install" extends="subcon" description="Core Helium libraries."/>
         <conf name="product" extends="core" description="Product build libraries."/>
-        <conf name="ido" extends="core" description="IDO build tools from SymSEE."/>
         <conf name="sf_install" description="SF build libraries."/>
+        <conf name="ido" extends="core" description="IDO build."/>
         <conf name="ido_install" extends="ido" description="IDO build libraries."/>
         <conf name="internal" extends="ido" description="Internal libraries."/>
     </configurations>
     
     <publications/>
     
-    <dependencies defaultconfmapping="core->default;subcon->default;core_install->default;ido_install->default;sf_install->default">
-        <!-- Core dependencies -->
-        <dependency org="SWEPT" name="ant" rev="1.7" conf="core"/>
-        <dependency org="SWEPT" name="java" rev="1.6" conf="core"/>
-        <dependency org="SWEPT" name="perl" rev="5.6.1" conf="core"/>
-        <dependency org="SWEPT" name="python" rev="2.6" conf="core"/>
-
-        <!-- Dependency for product builds -->
-        <dependency org="SWEPT" name="unzip" rev="5.40" conf="product->default"/>
-        
-        <!-- IDO dependencies -->
-        <dependency org="SWEPT" name="7zip" rev="4" conf="ido->default"/>
-        <dependency org="SWEPT" name="ccm" rev="exactlyAnyOne(6.5, 7.1)" conf="ido->default"/>
-        <dependency org="SWEPT" name="codescanner" rev="[2.0,2.1]" conf="ido->default"/>
-        <dependency org="SWEPT" name="java13" rev="1.3.1" conf="ido->default"/>
-        <dependency org="SWEPT" name="sbs" rev="2.12" conf="ido->default"/>
-        <dependency org="SWEPT" name="ctc" rev="6.5" conf="ido->default"/>
+    <dependencies defaultconfmapping="subcon->default;core_install->default;ido_install->default;sf_install->default">
         
         <!-- These dependencies are not in Ibiblio Maven2 so they need to be referenced explicitly by url -->
         <dependency org="python" name="eggs_subcon" rev="1.0" conf="subcon"/>
@@ -144,12 +128,6 @@
         <!-- License: BSD -->
         <dependency org="javax.xml.soap" name="saaj-api" rev="1.3" transitive="false" conf="core_install"/>
         
-        <!--
-        sun.mail
-        <dependency org="" name="dsn" rev="latest.integration" transitive="false" conf="core_install"/>
-        <dependency org="" name="smtp" rev="latest.integration" transitive="false" conf="core_install"/>
-        -->
-        
         <!-- Installed using installer -->
         <!-- License: MIT -->
         <dependency org="java" name="jep" rev="2.3-java6" transitive="false" conf="subcon"/>