From 73cc1363e5b3152a2805906755f8fe53131db69e Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Fri, 16 Nov 2007 18:18:55 +0000
Subject: [PATCH] upgrades to latest versions

---
 spring-webflow/ivy.xml | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 56b0912d..bef2af5f 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -19,39 +19,43 @@
 
 	<dependencies defaultconf="global->default">
 		<!--  global (core) dependencies -->
-		<dependency org="commons-logging" name="commons-logging" rev="1.0.4" />
+		<dependency org="commons-logging" name="commons-logging" rev="1.1">
+			<exclude module="log4j"/>
+			<exclude module="logkit"/>
+			<exclude module="avalon-framework"/>
+			<exclude module="servlet-api"/>
+		</dependency>
 		<dependency org="ognl" name="ognl" rev="2.6.9" />
 		<!-- Xerces and XML-apis are required only under JDK 1.4 for XSD support -->
 		<!-- Note: POMs are incorrect in m2 repo; ignoring since they are optional anyway
 		<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.5-rc1" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.5-rc2" />
 		<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
-		<dependency org="org.springframework" name="spring-core" rev="2.5-rc1" />
-		<dependency org="org.springframework" name="spring-context" rev="2.5-rc1" />
-		<dependency org="org.springframework" name="spring-web" rev="2.5-rc1" />
+		<dependency org="org.springframework" name="spring-core" rev="2.5-rc2" />
+		<dependency org="org.springframework" name="spring-context" rev="2.5-rc2" />
+		<dependency org="org.springframework" name="spring-web" rev="2.5-rc2" />
 		
 		<!-- 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.5-rc1" conf="buildtime, mvc->default" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.5-rc2" conf="buildtime, mvc->default" />
 
 		<!-- spring portlet mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5-rc1" conf="buildtime, portlet->default" />
+		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5-rc2" conf="buildtime, portlet->default" />
 
 		<!-- 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.5-rc1" conf="buildtime, struts->default" />
+		<dependency org="org.springframework" name="spring-webmvc-struts" rev="2.5-rc2" conf="buildtime, struts->default" />
 
 		<!-- build time only dependencies -->		
 		<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="javax.el" name="el-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.5-rc1" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-tx" rev="2.5-rc1" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-orm" rev="2.5-rc2" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-tx" rev="2.5-rc2" 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" />
 	
@@ -61,10 +65,10 @@
 		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
 		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
 		<dependency org="aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5-rc1" conf="test->default" />		
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5-rc1" conf="test->default" />
-		<dependency org="org.springframework" name="spring-test" rev="2.5-rc1" conf="test->default" />
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="test->default" />
+		<dependency org="org.springframework" name="spring-aop" rev="2.5-rc2" conf="test->default" />		
+		<dependency org="org.springframework" name="spring-jdbc" rev="2.5-rc2" conf="test->default" />
+		<dependency org="org.springframework" name="spring-test" rev="2.5-rc2" conf="test->default" />
+		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="buildtime, 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" />