diff --git a/build-spring-webflow/ivysettings.xml b/build-spring-webflow/ivysettings.xml
index 7150a2f8..09173dea 100644
--- a/build-spring-webflow/ivysettings.xml
+++ b/build-spring-webflow/ivysettings.xml
@@ -9,18 +9,24 @@
 			<resolver ref="external-lookup"/>
             <!-- Maven central -->
 			<ibiblio name="maven2" m2compatible="true"/>
-            <!-- Repository for Mojarra 2.x -->
-			<url name="java-net-maven2" m2compatible="true">
-				<artifact pattern="http://download.java.net/maven/2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
-			</url>
-            <!-- Repository for PrimeFaces -->
-			<url name="primefaces-maven2" m2compatible="true">
-				<artifact pattern="http://repository.prime.com.tr/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
-			</url>
-            <!-- Repository for MyFaces Core 2.0.1-SNAPSHOT -->
-			<url name="apache-maven2-snapshot" m2compatible="true">
-				<artifact pattern="http://people.apache.org/repo/m2-snapshot-repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
-			</url>
+            <!-- Mojarra 2.x -->
+            <ibiblio name="java-net"
+                     m2compatible="true"
+                     usepoms="true"
+                     pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+                     root="http://download.java.net/maven/2"/>
+            <!-- PrimeFaces -->
+            <ibiblio name="primefaces"
+                     m2compatible="true"
+                     usepoms="true"
+                     pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+                     root="http://repository.prime.com.tr"/>
+            <!-- MyFaces Core 2.0.1-SNAPSHOT -->
+            <ibiblio name="apache-maven2-snapshot"
+                     m2compatible="true"
+                     usepoms="true"
+                     pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+                     root="http://people.apache.org/repo/m2-snapshot-repository"/>
 		</chain>
 	</resolvers>
 
diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index 89b9d96f..47f2964f 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -42,33 +42,28 @@
 		<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/>
 
 		<!-- JSF 2.0 Mojarra dependencies -->
-		<dependency org="com.sun.faces" name="jsf-api" rev="2.0.3" conf="provided, mojarra20->runtime(*)" />
-		<dependency org="com.sun.faces" name="jsf-impl" rev="2.0.3" conf="provided, mojarra20->runtime(*)" />
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.2.0" conf="test, mojarra20->runtime"/>
+		<dependency org="com.sun.faces" name="jsf-api" rev="2.0.3" conf="provided, mojarra20->default" />
+		<dependency org="com.sun.faces" name="jsf-impl" rev="2.0.3" conf="provided, mojarra20->default" />
 
 		<!-- JSF 2.0 MyFaces dependencies -->
-   		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="2.0.1-SNAPSHOT" conf="provided, myfaces20->runtime(*)" />
-   		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="2.0.1-SNAPSHOT" conf="provided, myfaces20->runtime(*)" />
-   		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.discovery" rev="0.4.0" conf="provided, myfaces20->runtime(*)" />
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.digester" rev="1.8.0" conf="provided, myfaces20->runtime(*)" />
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.codec" rev="1.3.0" conf="provided, myfaces20->runtime(*)" />
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.2.0" conf="test, mojarra20->runtime"/>
+   		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="2.0.1-SNAPSHOT" conf="provided, myfaces20->default" />
+   		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="2.0.1-SNAPSHOT" conf="provided, myfaces20->default" />
 
 		<!-- JSF 1.2 Mojarra dependencies -->
 		<dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.09" conf="provided, mojarra12->runtime" />
 		<dependency org="com.sun.faces" name="com.springsource.com.sun.faces" rev="1.2.0.09" conf="provided, mojarra12->runtime" />
     	
 		<!-- JSF 1.2 MyFaces dependencies -->
-		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.9" conf="myfaces12->runtime(*)" />
-		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.9" conf="myfaces12->runtime(*)" />
+		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.9" conf="myfaces12->default" />
+		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.9" conf="myfaces12->default" />
 
 		<!-- JSF 1.1 MyFaces dependencies -->
 		<dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces.javax.faces" rev="1.1.5" conf="jsf11->runtime" />
 		<dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces" rev="1.1.5" conf="jsf11->runtime" />
 
 		<!--  MyFaces JSF-Portlet Bridge for Portlet 2.0 and JSF 1.2 -->    	
-		<dependency org="org.apache.myfaces.portlet-bridge" name="portlet-bridge-api" rev="2.0.0-alpha-2" conf="provided, myfacesPortlet20->runtime(*)" />
-		<dependency org="org.apache.myfaces.portlet-bridge" name="portlet-bridge-impl" rev="2.0.0-alpha-2" conf="provided, myfacesPortlet20->runtime(*)" />
+		<dependency org="org.apache.myfaces.portlet-bridge" name="portlet-bridge-api" rev="2.0.0-alpha-2" conf="provided, myfacesPortlet20->default" />
+		<dependency org="org.apache.myfaces.portlet-bridge" name="portlet-bridge-impl" rev="2.0.0-alpha-2" conf="provided, myfacesPortlet20->default" />
 
 		<!-- test time only dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime" />