From 13755f4bbe971ce43bde47ce3e20264504210894 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 9 Apr 2010 11:45:33 +0000
Subject: [PATCH] SWF-1225 Update build properties for 2.1.0 release number.

---
 build-spring-webflow/resources/readme.txt     | 28 +++++++++----------
 build.properties                              |  2 +-
 spring-binding/pom.xml                        |  4 +--
 spring-faces/pom.xml                          |  4 +--
 spring-faces/template.mf                      |  8 +++---
 spring-js/pom.xml                             |  4 +--
 spring-webflow-reference/src/overview.xml     | 28 +++++++++----------
 .../src/spring-webflow-reference.xml          |  2 +-
 spring-webflow-samples/booking-faces/pom.xml  |  4 +--
 spring-webflow-samples/booking-mvc/pom.xml    |  4 +--
 .../booking-portlet-faces/pom.xml             |  4 +--
 .../booking-portlet-mvc/pom.xml               |  4 +--
 spring-webflow-samples/jsf-booking/pom.xml    |  4 +--
 spring-webflow/pom.xml                        |  4 +--
 spring-webflow/template.mf                    |  4 +--
 15 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt
index 259641c1..b5f7d94d 100644
--- a/build-spring-webflow/resources/readme.txt
+++ b/build-spring-webflow/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB FLOW 2.0.9 ()
+SPRING WEB FLOW 2.1.0 ()
 ----------------------------------
 http://www.springframework.org/webflow
 
@@ -49,21 +49,21 @@ The following jar files are included in the distribution.
 The contents of each jar and its dependencies are noted.
 Dependencies in [brackets] are optional, and are just necessary for certain functionality.
 
-* org.springframework.webflow-2.0.9.RELEASE.jar
+* org.springframework.webflow-2.1.0.RELEASE.jar
 - Contents: The Spring Web Flow system
 - Dependencies: Commons Logging, spring-core, spring-beans, spring-context, spring-binding, spring-web, spring-webmvc-servlet, spring-js
                 [Log4J, Xerces, XML APIs, OGNL, EL API, JPA API, Hibernate, Spring Security, Servlet API, Portlet API, JUnit]
               
-* org.springframework.binding-2.0.9.RELEASE.jar
+* org.springframework.binding-2.1.0.RELEASE.jar
 - Contents: The Spring Data Binding framework, a utility library used by Web Flow
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context
                 [Log4J, OGNL, EL API]
 
-* org.springframework.js-2.0.9.RELEASE.jar
+* org.springframework.js-2.1.0.RELEASE.jar
 - Contents: The Spring JavaScript module, containing Spring's Dojo integration and additional JavaScript functionality.
 - Dependencies: Dojo Toolkit
 
-* org.springframework.faces-2.0.9.RELEASE.jar
+* org.springframework.faces-2.1.0.RELEASE.jar
 - Contents: The Spring Faces module, containing Spring's integration with Java Server Faces (JSF) and additional JSF functionality.
 - Dependencies: spring-webflow, spring-js, JSF API
                                 
@@ -102,19 +102,19 @@ Then declare the following dependencies:
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.binding</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 If using JavaServerFaces:
@@ -122,7 +122,7 @@ If using JavaServerFaces:
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 To access jars using Ivy, add the following repositories to your Ivy config:
@@ -139,13 +139,13 @@ To access jars using Ivy, add the following repositories to your Ivy config:
 
 Then declare the following dependencies in your ivy.xml:
 
-<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.0.9.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.0.9.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.0.9.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.1.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.1.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.1.0.RELEASE" conf="compile->runtime" />
 
 If using JavaServerFaces:
 
-<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.0.9.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.1.0.RELEASE" conf="compile->runtime" />
 
 Refer to the reference documentation for more coverage on obtaining Web Flow jars using Maven or Ivy.
 	
@@ -164,4 +164,4 @@ There you will find an active community of users collaborating about the project
 The Spring Community portal is located at:
     http://www.springframework.org
 
-There you will find links to many resources on Spring Portfolio projects, including on-line access to Spring documentation.
\ No newline at end of file
+There you will find links to many resources on Spring Portfolio projects, including on-line access to Spring documentation.
diff --git a/build.properties b/build.properties
index 42a10e17..5524f674 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=2.0.9
+version=2.1.0
 release.type=integration
 natural.name=spring-webflow
 project.key=SWF
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index 4f696dae..b27e19aa 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>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -50,4 +50,4 @@
 	<properties>
 		<spring.version>2.5.6.SEC01</spring.version>
 	</properties>	
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
index 9bcc01d1..ff3a2dc6 100644
--- a/spring-faces/pom.xml
+++ b/spring-faces/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-faces</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Faces</name>
-	<version>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -111,4 +111,4 @@
 		<spring.version>2.5.6.SEC01</spring.version>
 		<jsf.version>1.2_09</jsf.version>		
 	</properties>	
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-faces/template.mf b/spring-faces/template.mf
index 45bf98ca..6e5e113b 100644
--- a/spring-faces/template.mf
+++ b/spring-faces/template.mf
@@ -3,11 +3,11 @@ Bundle-Name: Spring Faces
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.springframework.webflow.engine.builder.support;version="[2.0.9, 2.0.10)"
+ org.springframework.webflow.engine.builder.support;version="[2.1.0, 2.1.1)"
 Import-Template: 
- org.springframework.binding.*;version="[2.0.9, 2.0.10)",
- org.springframework.js.*;version="[2.0.9, 2.0.10)",
- org.springframework.webflow.*;version="[2.0.9, 2.0.10)",
+ org.springframework.binding.*;version="[2.1.0, 2.1.1)",
+ org.springframework.js.*;version="[2.1.0, 2.1.1)",
+ org.springframework.webflow.*;version="[2.1.0, 2.1.1)",
  org.springframework.*;version="[2.5.6.SEC01, 3.1.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.el;version="[1.0.0, 2.0.0)",
diff --git a/spring-js/pom.xml b/spring-js/pom.xml
index 2a6459cf..20019cb7 100644
--- a/spring-js/pom.xml
+++ b/spring-js/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-js</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring JavaScript</name>
-	<version>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -67,4 +67,4 @@
 	<properties>
 		<spring.version>2.5.6.SEC01</spring.version>
 	</properties>	
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow-reference/src/overview.xml b/spring-webflow-reference/src/overview.xml
index ed2bf3ff..8fcc6ee4 100644
--- a/spring-webflow-reference/src/overview.xml
+++ b/spring-webflow-reference/src/overview.xml
@@ -73,19 +73,19 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-binding</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-js</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-webflow</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency>
 ]]>
 		</programlisting>
@@ -96,7 +96,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-faces</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 ]]>
 		</programlisting>
@@ -133,19 +133,19 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.binding</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency>]]>
 			</programlisting>
 			<para>
@@ -155,7 +155,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency>]]>
 			</programlisting>
 			<para>
@@ -188,18 +188,18 @@
 			</para>
 			<programlisting language="xml"><![CDATA[
 <dependency org="org.springframework.webflow" name="org.springframework.binding"
-            rev="2.0.9.RELEASE" conf="compile->runtime" />
+            rev="2.1.0.RELEASE" conf="compile->runtime" />
 <dependency org="org.springframework.webflow" name="org.springframework.js"
-            rev="2.0.9.RELEASE" conf="compile->runtime" />
+            rev="2.1.0.RELEASE" conf="compile->runtime" />
 <dependency org="org.springframework.webflow" name="org.springframework.webflow"
-            rev="2.0.9.RELEASE" conf="compile->runtime" />]]>
+            rev="2.1.0.RELEASE" conf="compile->runtime" />]]>
 			</programlisting>
 			<para>
 				And if using JavaServerFaces:
 			</para>
 			<programlisting language="xml"><![CDATA[
 <dependency org="org.springframework.webflow" name="org.springframework.faces"
-            rev="2.0.9.RELEASE" conf="compile->runtime" />]]>
+            rev="2.1.0.RELEASE" conf="compile->runtime" />]]>
 			</programlisting>
 		</sect2>
 		<sect2 id="webflow-dm-server-lib">
@@ -224,7 +224,7 @@
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow-library</artifactId>
     <type>libd</type>
-    <version>2.0.9.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
 </dependency>]]>	
 			</programlisting>
 		</sect2>
@@ -337,4 +337,4 @@
 			Get the snapshot zip with the most recent CI build number from the <ulink url="http://static.springframework.org/downloads/nightly/snapshot-download.php?project=SWF">Web Flow snapshot download area</ulink>.		
 		</para>
 	</sect1>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/spring-webflow-reference/src/spring-webflow-reference.xml b/spring-webflow-reference/src/spring-webflow-reference.xml
index 70f2c678..a32cf6f3 100644
--- a/spring-webflow-reference/src/spring-webflow-reference.xml
+++ b/spring-webflow-reference/src/spring-webflow-reference.xml
@@ -25,7 +25,7 @@
 		<title>Spring Web Flow Reference Guide</title>
 		<titleabbrev>Spring Web Flow</titleabbrev>
 		<productname>Spring Web Flow</productname>
-		<releaseinfo>Version 2.0.9</releaseinfo>
+		<releaseinfo>Version 2.1.0</releaseinfo>
 		<pubdate></pubdate>
 		<authorgroup>
 			<author>
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index 61506f0b..1b03d9f0 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>swf-booking-faces</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
@@ -199,4 +199,4 @@
 		<spring.version>2.5.6.SEC01</spring.version>
 		<jsf.version>1.2.0.09</jsf.version>
 	</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml
index ead2b6b0..194db40d 100644
--- a/spring-webflow-samples/booking-mvc/pom.xml
+++ b/spring-webflow-samples/booking-mvc/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-mvc</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>
@@ -208,4 +208,4 @@
 	<properties>
 		<spring.version>2.5.6.SEC01</spring.version>
 	</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml
index 96e57fd2..d455563e 100644
--- a/spring-webflow-samples/booking-portlet-faces/pom.xml
+++ b/spring-webflow-samples/booking-portlet-faces/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-portlet-faces</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
@@ -194,4 +194,4 @@
 		<spring.version>2.5.6.SEC01</spring.version>
 		<jsf.version>1.2.0.09</jsf.version>
 	</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml
index efa24c53..471919f7 100644
--- a/spring-webflow-samples/booking-portlet-mvc/pom.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-portlet-mvc</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>
@@ -176,4 +176,4 @@
 	<properties>
 		<spring.version>2.5.6.SEC01</spring.version>
 	</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml
index 18273014..3b9ef58b 100644
--- a/spring-webflow-samples/jsf-booking/pom.xml
+++ b/spring-webflow-samples/jsf-booking/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>jsf-booking</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
@@ -163,4 +163,4 @@
 		<spring.version>2.5.6.SEC01</spring.version>
 		<jsf.version>1.2.0.09</jsf.version>
 	</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index 24f1f433..5b34ae63 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>2.0.9.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -136,4 +136,4 @@
 	<properties>
 		<spring.version>2.5.6.SEC01</spring.version>
 	</properties>	
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf
index d8bd03da..7e074f7e 100644
--- a/spring-webflow/template.mf
+++ b/spring-webflow/template.mf
@@ -3,8 +3,8 @@ Bundle-Name: Spring Web Flow
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.binding.*;version="[2.0.9, 2.0.10)",
- org.springframework.js.*;version="[2.0.9, 2.0.10)",
+ org.springframework.binding.*;version="[2.1.0, 2.1.1)",
+ org.springframework.js.*;version="[2.1.0, 2.1.1)",
  org.springframework.*;version="[2.5.6.SEC01, 3.1.0)",
  org.springframework.orm.*;version="[2.5.6.SEC01, 3.1.0)";resolution:=optional,
  org.springframework.transaction.*;version="[2.5.6.SEC01, 3.1.0)";resolution:=optional,