From 3a4ccfb562d7082ed1fa09b336fdb3948f09aea0 Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Tue, 19 Jun 2007 20:44:34 +0000
Subject: [PATCH] Upgrade SWF 1.0 maintenance to Spring 2.0.6

---
 spring-binding/ivy.xml                      |  6 +++---
 spring-binding/pom.xml                      |  9 ++++-----
 spring-webflow-samples/sellitem-jsf/ivy.xml |  8 ++++----
 spring-webflow-samples/sellitem/ivy.xml     |  8 ++++----
 spring-webflow-sandbox/ivy.xml              |  8 ++++----
 spring-webflow/ivy.xml                      | 16 ++++++++--------
 spring-webflow/pom.xml                      | 19 +++++++++----------
 7 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index 228d16ef..57318a52 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.0.5" />
-		<dependency org="org.springframework" name="spring-context"	rev="2.0.5" />
-		<dependency org="org.springframework" name="spring-core" rev="2.0.5" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.0.6" />
+		<dependency org="org.springframework" name="spring-context"	rev="2.0.6" />
+		<dependency org="org.springframework" name="spring-core" rev="2.0.6" />
 
 		<!-- test dependencies -->
 		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index 4f4fbfdd..c91ad3bc 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-binding</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Binding</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<description>Spring Data Binding Framework</description>
 	<url>http://www.springframework.org</url>
 	<licenses>
@@ -18,7 +18,6 @@
 	<scm>
 		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
 		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
-		<tag>spring-webflow-1.0.4</tag>
 		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
 	</scm>
 	<organization>
@@ -41,17 +40,17 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 		</dependency>
 <!-- Runtime Dependencies -->
 		<dependency>
diff --git a/spring-webflow-samples/sellitem-jsf/ivy.xml b/spring-webflow-samples/sellitem-jsf/ivy.xml
index 63213304..cd343818 100644
--- a/spring-webflow-samples/sellitem-jsf/ivy.xml
+++ b/spring-webflow-samples/sellitem-jsf/ivy.xml
@@ -16,9 +16,9 @@
     <dependency org="jstl" name="jstl" rev="1.1.2"/>
 	<dependency org="aopalliance" name="aopalliance" rev="1.0" />
     <dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default,jsf"/>
-    <dependency org="org.springframework" name="spring-aop" rev="2.0.5"/>
-    <dependency org="org.springframework" name="spring-dao" rev="2.0.5"/>
-    <dependency org="org.springframework" name="spring-jdbc" rev="2.0.5"/>
+    <dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
+    <dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
+    <dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
 	<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"/>
     
     <!-- build-time only dependencies -->
@@ -26,7 +26,7 @@
 	
 	<!-- test-time only dependencies -->
     <dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
-    <dependency org="org.springframework" name="spring-mock" rev="2.0.5" conf="test->default"/>
+    <dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default"/>
   </dependencies>
   
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow-samples/sellitem/ivy.xml b/spring-webflow-samples/sellitem/ivy.xml
index 956ed894..326243fe 100644
--- a/spring-webflow-samples/sellitem/ivy.xml
+++ b/spring-webflow-samples/sellitem/ivy.xml
@@ -16,9 +16,9 @@
     <dependency org="jstl" name="jstl" rev="1.1.2"/>
 	<dependency org="aopalliance" name="aopalliance" rev="1.0" />
     <dependency org="org.springframework" name="spring-webflow" rev="latest.integration"/>
-    <dependency org="org.springframework" name="spring-aop" rev="2.0.5"/>
-    <dependency org="org.springframework" name="spring-dao" rev="2.0.5"/>
-    <dependency org="org.springframework" name="spring-jdbc" rev="2.0.5"/>
+    <dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
+    <dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
+    <dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
 	<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"/>
 
 	<!-- build-time only dependencies -->
@@ -27,7 +27,7 @@
 	<!-- test-time only dependencies -->
     <dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
     <dependency	org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
-    <dependency org="org.springframework" name="spring-mock" rev="2.0.5" conf="test->default"/>
+    <dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default"/>
   </dependencies>
   
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow-sandbox/ivy.xml b/spring-webflow-sandbox/ivy.xml
index 299e4730..f5ffcb10 100644
--- a/spring-webflow-sandbox/ivy.xml
+++ b/spring-webflow-sandbox/ivy.xml
@@ -15,10 +15,10 @@
     <dependency org="taglibs" name="standard" rev="1.1.2"/>
     <dependency org="jstl" name="jstl" rev="1.1.2"/>
     <dependency org="org.springframework" name="spring-webflow" rev="latest.integration"/>
-    <dependency org="org.springframework" name="spring-aop" rev="2.0.5"/>
-    <dependency org="org.springframework" name="spring-dao" rev="2.0.5"/>
-    <dependency org="org.springframework" name="spring-jdbc" rev="2.0.5"/>
-    <dependency org="org.springframework" name="spring-jpa" rev="2.0.5"/>
+    <dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
+    <dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
+    <dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
+    <dependency org="org.springframework" name="spring-jpa" rev="2.0.6"/>
     <dependency org="javax.servlet" name="servlet-api" rev="2.4"/>
     <dependency org="javax.persistence" name="persistence-api" rev="1.0"/>
     <dependency org="org.hibernate" name="hibernate" rev="3.2.1.ga"/>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 1d9ffd66..5c5dd8ec 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -27,24 +27,24 @@
 		<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.0.5" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.0.6" />
 		<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
-		<dependency org="org.springframework" name="spring-core" rev="2.0.5" />
-		<dependency org="org.springframework" name="spring-context" rev="2.0.5" />
-		<dependency org="org.springframework" name="spring-web" rev="2.0.5" />
+		<dependency org="org.springframework" name="spring-core" rev="2.0.6" />
+		<dependency org="org.springframework" name="spring-context" rev="2.0.6" />
+		<dependency org="org.springframework" name="spring-web" rev="2.0.6" />
 		
 		<!-- 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.0.5" conf="buildtime, mvc->default" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.0.6" conf="buildtime, mvc->default" />
 
 		<!-- spring portlet mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-portlet" rev="2.0.5" conf="buildtime, portlet->default" />
+		<dependency org="org.springframework" name="spring-portlet" rev="2.0.6" 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-struts" rev="2.0.5" conf="buildtime, struts->default" />
+		<dependency org="org.springframework" name="spring-struts" rev="2.0.6" conf="buildtime, struts->default" />
 
 		<!-- JSF-only dependencies -->
 		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
@@ -60,7 +60,7 @@
 		<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-mock" rev="2.0.5" conf="test->default" />
+		<dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index 326542ca..fe6dad06 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-webflow</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Web Flow</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<description>Spring Web Flow</description>
 	<url>http://www.springframework.org</url>
 	<licenses>
@@ -18,7 +18,6 @@
 	<scm>
 		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
 		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
-		<tag>spring-webflow-1.0.4</tag>
 		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
 	</scm>
 	<organization>
@@ -83,7 +82,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -93,34 +92,34 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-portlet</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-struts</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 			<optional>true</optional>
 		</dependency>
 <!-- Runtime Dependencies -->
@@ -147,7 +146,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.6</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>