From 8849235cbbb0295fdf80be587151ca1c0081b1e7 Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Mon, 10 Sep 2007 21:08:21 +0000
Subject: [PATCH] I must remember to do 'clean-all' before commiting.  The rest
 of the changes for the 2.1-m4 release.

---
 common-build/ivysettings.xml | 4 ++++
 spring-webflow/ivy.xml       | 1 +
 2 files changed, 5 insertions(+)

diff --git a/common-build/ivysettings.xml b/common-build/ivysettings.xml
index 779428eb..8cba4721 100644
--- a/common-build/ivysettings.xml
+++ b/common-build/ivysettings.xml
@@ -54,7 +54,9 @@
 
 	<modules>
 		<!-- Pointing modules at local resolvers speeds resolution performance -->
+		<module organisation="org.springframework" name="spring-agent" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-aop" resolver="spring-projects"/>
+		<module organisation="org.springframework" name="spring-aspects" resolver="spring-projects"/>
 		<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"/>
@@ -80,12 +82,14 @@
 		<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-tomcat-weaver" 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"/>
 		<module organisation="org.springframework" name="spring-webflow" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-webmvc" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-webmvc-portlet" resolver="spring-projects"/>
+		<module organisation="org.springframework" name="spring-webmvc-struts" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-ws-core" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-ws-security" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-xml" resolver="spring-projects"/>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 39febe58..dc033178 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -43,6 +43,7 @@
 
 		<!-- struts only dependencies -->
 		<dependency org="struts" name="struts" rev="1.2.9" conf="buildtime, struts->default" />
+		<dependency org="org.springframework" name="spring-webmvc-struts" rev="2.1-m4" conf="buildtime, struts->default" />
 
 		<!-- build time only dependencies -->
 		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />