diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index 37b5e841..c939d704 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -28,6 +28,11 @@
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile" />
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
 		<dependency org="org.richfaces" name="com.springsource.org.richfaces" rev="3.1.4.GA" conf="optional->compile" />
+        <dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
+        <dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
+        <dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-binding" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
diff --git a/spring-js/ivy.xml b/spring-js/ivy.xml
index 1b28267f..17b51289 100644
--- a/spring-js/ivy.xml
+++ b/spring-js/ivy.xml
@@ -26,8 +26,9 @@
         <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles" rev="2.0.5" conf="optional->compile"/>
         <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.core" rev="2.0.5.osgi" conf="optional->compile"/>
 		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.0.5" conf="optional->compile"/>
-		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
         <dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>        
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
         <dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
         <dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
 
diff --git a/spring-webflow-samples/booking-faces/.classpath b/spring-webflow-samples/booking-faces/.classpath
index 41effcfe..fa8cef5b 100755
--- a/spring-webflow-samples/booking-faces/.classpath
+++ b/spring-webflow-samples/booking-faces/.classpath
@@ -6,7 +6,8 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="/IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-sources-2.1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
index a6afcdd9..5a845e16 100755
--- a/spring-webflow-samples/booking-faces/ivy.xml
+++ b/spring-webflow-samples/booking-faces/ivy.xml
@@ -31,11 +31,16 @@
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
-		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>		
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.4.A" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>	
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
 		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
diff --git a/spring-webflow-samples/booking-mvc/.classpath b/spring-webflow-samples/booking-mvc/.classpath
index 3d2926b9..275fd7fb 100755
--- a/spring-webflow-samples/booking-mvc/.classpath
+++ b/spring-webflow-samples/booking-mvc/.classpath
@@ -6,9 +6,9 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
index 1542bcdc..167082f1 100755
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-mvc/ivy.xml
@@ -35,10 +35,15 @@
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
 		<dependency org="org.ognl" name="com.springsource.org.ognl" rev="2.6.9" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="compile->compile"/>
 		<dependency org="org.springframework.security" name="org.springframework.security.taglibs" rev="2.0.0.A" conf="compile->compile"/>
  		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
diff --git a/spring-webflow-samples/booking-portlet-faces/.classpath b/spring-webflow-samples/booking-portlet-faces/.classpath
index 586c7ad0..afae6359 100644
--- a/spring-webflow-samples/booking-portlet-faces/.classpath
+++ b/spring-webflow-samples/booking-portlet-faces/.classpath
@@ -6,5 +6,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-portlet-faces/ivy.xml b/spring-webflow-samples/booking-portlet-faces/ivy.xml
index cfafa3af..10b9c93e 100644
--- a/spring-webflow-samples/booking-portlet-faces/ivy.xml
+++ b/spring-webflow-samples/booking-portlet-faces/ivy.xml
@@ -33,12 +33,17 @@
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
-		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>		
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
 
diff --git a/spring-webflow-samples/booking-portlet-mvc/.classpath b/spring-webflow-samples/booking-portlet-mvc/.classpath
index 996dbcc2..bf86d96e 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.classpath
+++ b/spring-webflow-samples/booking-portlet-mvc/.classpath
@@ -6,7 +6,8 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/1.0.0/com.springsource.javax.portlet-1.0.0.jar" sourcepath="IVY_CACHE/javax.portlet/portlet-api/portlet-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/1.0.0/com.springsource.javax.portlet-1.0.0.jar" sourcepath="/IVY_CACHE/javax.portlet/com.springsource.javax.portlet/1.0.0/com.springsource.javax.portlet-sources-1.0.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-portlet-mvc/ivy.xml b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
index 9c9585eb..599112eb 100644
--- a/spring-webflow-samples/booking-portlet-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
@@ -35,10 +35,15 @@
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
 		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
 
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 379613f5..6be18ece 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -32,13 +32,13 @@
 		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="provided, test->compile" />
 		<dependency org="org.ognl" name="com.springsource.org.ognl" rev="2.6.9" conf="optional->compile" />
 		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.4.A" conf="optional->compile" />
-		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.4.A" conf="optional->compile" />
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="optional->compile" />
+		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.4.A" conf="optional->compile" />
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="optional->compile" />
 		<dependency org="org.springframework.webflow" name="spring-binding" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>