From f65b830bca98a00b0991d7d4022b7548476e004e Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@vmware.com>
Date: Tue, 8 Apr 2008 15:25:49 +0000
Subject: [PATCH] block spring 2.5.2 jars from importing

---
 spring-webflow-samples/booking-mvc/ivy.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
index 4b7a06f7..c05f8b5e 100755
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-mvc/ivy.xml
@@ -47,7 +47,10 @@
 		<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
 		<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>
 		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2"/>
-		<dependency org="org.springframework.security" name="spring-security-taglibs" rev="2.0.0.m2"/>
+		<dependency org="org.springframework.security" name="spring-security-taglibs" rev="2.0.0.m2">
+			<!-- exclude org.springframework otherwise spring 2.5.2 will be included -->
+			<exclude org="org.springframework"/>
+		</dependency>
  		<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"/>
 		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="compile->default"/>