diff --git a/common-build/ivysettings.xml b/common-build/ivysettings.xml
index d4b54270..779428eb 100644
--- a/common-build/ivysettings.xml
+++ b/common-build/ivysettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivysettings>
 	<properties file="${ivy.conf.dir}/ivyconf.properties"/>
-	<settings defaultResolver="maven2"/>
+	<settings defaultResolver="maven"/>
 		<resolvers>
 		<chain name="spring-projects" returnFirst="true">
 			<!-- try developer's local integration repository first -->
@@ -17,19 +17,14 @@
 			</filesystem>
 
 			<!-- pull from the main release repository third -->
-			<url name="spring-repo" m2compatible="true">
-				<ivy pattern="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo/[organisation]/[module]/ivy-[revision].xml" />
-				<artifact pattern="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-			</url>
+			<ibiblio name="maven-central" checkconsistency="false" m2compatible="true" root="http://repo1.maven.org/maven2"/>
+
+			<!-- if still not resolved, try milestones -->
+			<ibiblio name="maven-spring-milestone" checkconsistency="false" m2compatible="true" root="http://s3.amazonaws.com/maven.springframework.org/milestone/"/>
 
-			<!-- if still not resolved, try snapshots -->
-			<url name="spring-repo-snapshots" m2compatible="true">
-				<ivy pattern="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-snapshots/[organisation]/[module]/ivy-[revision].xml" />
-				<artifact pattern="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-snapshots/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-			</url>
 		</chain>
 
-		<chain name="maven2" returnFirst="true">
+		<chain name="maven" returnFirst="true">
 			<!-- try shared local filesystem repository first -->
 			<filesystem name="filesystem-repo">
   				<ivy pattern="${repository.dir}/[organisation]/[module]/ivy-[revision].xml" /> 
@@ -42,14 +37,14 @@
 				<artifact pattern="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
 			</url>
 
-			<!-- try maven repo -->
-           	<ibiblio name="maven2-repo" checkconsistency="false" m2compatible="true" root="http://repo1.maven.org/maven2/"/>
+			<!-- try central maven repository -->
+           	<ibiblio name="maven-central" checkconsistency="false" m2compatible="true" root="http://repo1.maven.org/maven2/"/>
 
-			<!-- try jboss repo -->
-			<ibiblio name="jboss-maven2-repo" checkconsistency="false" m2compatible="true" root="http://repository.jboss.com/maven2/"/>
+			<!-- try jboss maven repo -->
+			<ibiblio name="maven-jboss" checkconsistency="false" m2compatible="true" root="http://repository.jboss.com/maven2/"/>
 			
-			<!-- try the java.net maven repo -->
-			<url name="java.net-repo" m2compatible="false">
+			<!-- try the maven java.net maven repo -->
+			<url name="maven-java.net" m2compatible="false">
 				<artifact pattern="http://download.java.net/maven/1/[organisation]/jars/[artifact]-[revision].[ext]" />
 			</url>
 			
@@ -63,6 +58,7 @@
 		<module organisation="org.springframework" name="spring-beans" resolver="spring-projects"/>
        	<module organisation="org.springframework" name="spring-binding" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-context" resolver="spring-projects"/>
+		<module organisation="org.springframework" name="spring-context-support" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-core" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-dao" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-faces" resolver="spring-projects"/>
@@ -83,6 +79,7 @@
 		<module organisation="org.springframework" name="spring-remoting" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-struts" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-support" resolver="spring-projects"/>
+		<module organisation="org.springframework" name="spring-test" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-toplink" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-tx" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-web" resolver="spring-projects"/>
diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index 449a230a..4c5e44d5 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -13,9 +13,9 @@
 		<!-- global dependencies -->
 		<dependency org="commons-logging" name="commons-logging" rev="1.0.4"/>
 		<dependency org="ognl" name="ognl" rev="2.6.9" />
-		<dependency org="org.springframework" name="spring-beans" rev="2.1-m3" />
-		<dependency org="org.springframework" name="spring-context"	rev="2.1-m3" />
-		<dependency org="org.springframework" name="spring-core" rev="2.1-m3" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.1-m4" />
+		<dependency org="org.springframework" name="spring-context"	rev="2.1-m4" />
+		<dependency org="org.springframework" name="spring-core" rev="2.1-m4" />
 
 		<!-- build time only dependencies -->
 		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index 8224448d..734d4604 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -41,7 +41,7 @@
 		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
 		<dependency org="jboss" name="jboss-el" rev="1.0" conf="test->default"/>
 		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
-		<dependency org="org.springframework" name="spring-mock" rev="2.1-m3" conf="test->default" />
+		<dependency org="org.springframework" name="spring-test" rev="2.1-m4" conf="test->default" />
 		
 	</dependencies>
 
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 02555292..39febe58 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -26,20 +26,20 @@
 		<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
 		<dependency org="xml-apis" name="xml-apis" rev="1.3.03"/>
 		-->
-		<dependency org="org.springframework" name="spring-beans" rev="2.1-m3" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.1-m4" />
 		<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
-		<dependency org="org.springframework" name="spring-core" rev="2.1-m3" />
-		<dependency org="org.springframework" name="spring-context" rev="2.1-m3" />
-		<dependency org="org.springframework" name="spring-web" rev="2.1-m3" />
+		<dependency org="org.springframework" name="spring-core" rev="2.1-m4" />
+		<dependency org="org.springframework" name="spring-context" rev="2.1-m4" />
+		<dependency org="org.springframework" name="spring-web" rev="2.1-m4" />
 		
 		<!-- testing support only dependencies -->
 		<dependency org="junit" name="junit" rev="3.8.2" conf="buildtime, testing->default" />
 
 		<!-- spring mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-webmvc" rev="2.1-m3" conf="buildtime, mvc->default" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.1-m4" conf="buildtime, mvc->default" />
 
 		<!-- spring portlet mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.1-m3" conf="buildtime, portlet->default" />
+		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.1-m4" conf="buildtime, portlet->default" />
 
 		<!-- struts only dependencies -->
 		<dependency org="struts" name="struts" rev="1.2.9" conf="buildtime, struts->default" />
@@ -48,8 +48,8 @@
 		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
 		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-orm" rev="2.1-m3" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-tx" rev="2.1-m3" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-orm" rev="2.1-m4" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-tx" rev="2.1-m4" conf="buildtime->default" />
 		<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default" />
 		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime->default" />
 	
@@ -58,8 +58,8 @@
 		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
 		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
 		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.1-m3" conf="test->default" />
-		<dependency org="org.springframework" name="spring-mock" rev="2.1-m3" conf="test->default" />
+		<dependency org="org.springframework" name="spring-jdbc" rev="2.1-m4" conf="test->default" />
+		<dependency org="org.springframework" name="spring-test" rev="2.1-m4" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="test->default" />