diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
index d230f2c..44f3a04 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -41,49 +41,25 @@
   <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
   <settings defaultResolver="${resolvers}"/>
 
-  <resolvers>
-    <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"/>
-    <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
-             checkmodified="${ivy.checkmodified}" 
-             changingPattern="${ivy.changingPattern}"/>
-
-    <url name="datanucleus-repo" m2compatible="true">
-      <artifact pattern="${datanucleus.repo}/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"/>
-    </url>
+  <typedef name="xmvn" classname="org.fedoraproject.maven.connector.ivy.IvyResolver"/>
 
-    <url name="sourceforge" m2compatible="false" checksums="">
-      <artifact pattern="${sourceforge-repo}/[module]/files/[module]/[branch]/[module]-[revision](-[classifier]).[ext]"/>
-    </url>
+  <resolvers>
+    <xmvn name="XMvn"/>
 
-    <filesystem name="fs" m2compatible="true" alwaysCheckExactRevision="true">
-       <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"/>
-       <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).pom"/>
+    <filesystem name="build" m2compatible="false" alwaysCheckExactRevision="false">
+       <artifact pattern="${build.dir.hive}/shims/[module]-[revision](-[classifier]).[ext]"/>
+       <artifact pattern="${build.dir.hive}/common/[module]-[revision](-[classifier]).[ext]"/>
+       <artifact pattern="${build.dir.hive}/serde/[module]-[revision](-[classifier]).[ext]"/>
+       <artifact pattern="${build.dir.hive}/metastore/[module]-[revision](-[classifier]).[ext]"/>
+       <artifact pattern="${build.dir.hive}/ql/[module]-[revision](-[classifier]).[ext]"/>
+       <artifact pattern="${build.dir.hive}/service/[module]-[revision](-[classifier]).[ext]"/>
+       <artifact pattern="${build.dir.hive}/cli/[module]-[revision](-[classifier]).[ext]"/>
     </filesystem>
 
-    <chain name="default" dual="true" returnFirst="true" 
-           checkmodified="${ivy.checkmodified}" 
-           changingPattern="${ivy.changingPattern}">
-      <resolver ref="local" />
-      <resolver ref="apache-snapshot"/>
-      <resolver ref="maven2"/>
-      <resolver ref="datanucleus-repo"/>
-      <resolver ref="sourceforge"/>
-    </chain>
-
-    <chain name="internal" dual="true">
-      <resolver ref="local" />
-      <resolver ref="fs"/>
-      <resolver ref="apache-snapshot"/>
-      <resolver ref="maven2"/>
-      <resolver ref="datanucleus-repo"/>
-      <resolver ref="sourceforge"/>
-    </chain>
-
-    <chain name="external">
-      <resolver ref="maven2"/>
-      <resolver ref="datanucleus-repo"/>
+    <chain name="default" dual="true">
+      <resolver ref="XMvn" />
+      <resolver ref="build" />
     </chain>
-
   </resolvers>
 
   <modules>
-- 
1.8.5.2