Release version 2.3.2

2013-01-31 17:12:28 -05:00
parent 8974263f8c
commit b270880d81
17 changed files with 46 additions and 29 deletions
--- a/build-spring-webflow/resources/changelog.txt
+++ b/build-spring-webflow/resources/changelog.txt
@@ -2,6 +2,18 @@ SPRING WEB FLOW CHANGELOG
 =========================
 http://www.springframework.org/webflow

+Changes in version 2.3.2.RELEASE (Jan 31, 2013)
+-----------------------------------------------
+
+Upgrade to Spring Framework 3.2
+Upgrade to Spring Security 3.1.3
+Ensure proper formatting with <spring:eval> tag
+Fix issue with composite components displayed at bottom of page
+Fix issue with JsfManagedBeanPropertyAccessor causes early release of FacesContext
+Skip DataModel iteration when delivering PostRestoreStateEvent
+Add inherited constructor to FacesConversionService
+Replace ${...} with #{...} in expression examples in Flow XSD
+
 Changes in version 2.3.1.RELEASE (Mar 27, 2012)
 -----------------------------------------------
 Upgrade Spring to version 3.1.1
--- a/build-spring-webflow/resources/readme.txt
+++ b/build-spring-webflow/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB FLOW 2.3.1
+SPRING WEB FLOW 2.3.2
 ----------------------
 http://www.springframework.org/webflow

@@ -50,25 +50,25 @@ 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.3.1.RELEASE.jar
+* org.springframework.webflow-2.3.2.RELEASE.jar
 - Contents: The Spring Web Flow system
 - Dependencies: Commons Logging, spring-core, spring-beans, spring-context, spring-expression, spring-binding, spring-web, spring-web-servlet, spring-js
                [Log4J, Xerces, XML APIs, OGNL, EL API, JPA API, Hibernate, Spring Security, Servlet API, Portlet API, JUnit]
              
-* org.springframework.binding-2.3.1.RELEASE.jar
+* org.springframework.binding-2.3.2.RELEASE.jar
 - Contents: The Spring Data Binding framework, a utility library used by Web Flow
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-expression
                [Log4J, OGNL, EL API]

-* org.springframework.js-2.3.1.RELEASE.jar
+* org.springframework.js-2.3.2.RELEASE.jar
 - Contents: The Spring JavaScript module
 - Dependencies: spring-beans, spring-core, spring-context, spring-web, spring-web-servlet

-* org.springframework.js.resources-2.3.1.RELEASE.jar
+* org.springframework.js.resources-2.3.2.RELEASE.jar
 - Contents: Spring's custom Dojo build and client-side Dojo integration files.
 - Dependencies: 

-* org.springframework.faces-2.3.1.RELEASE.jar
+* org.springframework.faces-2.3.2.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, spring-js-resources, JSF API
                                
@@ -101,19 +101,19 @@ via transitive dependencies):
 <dependency>
    <groupId>org.springframework.webflow</groupId>
    <artifactId>spring-binding</artifactId>
-    <version>2.3.1.RELEASE</version>
+    <version>2.3.2.RELEASE</version>
 </dependency> 

 <dependency>
    <groupId>org.springframework.webflow</groupId>
    <artifactId>spring-js</artifactId>
-    <version>2.3.1.RELEASE</version>
+    <version>2.3.2.RELEASE</version>
 </dependency> 

 <dependency>
    <groupId>org.springframework.webflow</groupId>
    <artifactId>spring-webflow</artifactId>
-    <version>2.3.1.RELEASE</version>
+    <version>2.3.2.RELEASE</version>
 </dependency> 

 If using JSF all you need to include is:
@@ -121,7 +121,7 @@ If using JSF all you need to include is:
 <dependency>
    <groupId>org.springframework.webflow</groupId>
    <artifactId>spring-faces</artifactId>
-    <version>2.3.1.RELEASE</version>
+    <version>2.3.2.RELEASE</version>
 </dependency> 

 To access jars using Ivy, add the following repositories to your Ivy config:
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,6 @@
 version=2.3.2
-release.type=integration
+release.type=release
+build.stamp=RELEASE
 natural.name=spring-webflow
 project.key=SWF
 ivy.cache.dir=${basedir}/../ivy-cache
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>spring-webflow-root</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Web Flow</name>
-	<version>2.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<modules>
 		<module>spring-binding</module>
 		<module>spring-js-resources</module>
--- 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.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
--- 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.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
--- 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.3.1, 2.4.0)"
+ org.springframework.webflow.engine.builder.support;version="[2.3.2, 2.4.0)"
 Import-Template: 
- org.springframework.binding.*;version="[2.3.1, 2.4.0)",
- org.springframework.js.*;version="[2.3.1, 2.4.0)",
- org.springframework.webflow.*;version="[2.3.1, 2.4.0)",
+ org.springframework.binding.*;version="[2.3.2, 2.4.0)",
+ org.springframework.js.*;version="[2.3.2, 2.4.0)",
+ org.springframework.webflow.*;version="[2.3.2, 2.4.0)",
 org.springframework.*;version="[3.1.0.RELEASE, 3.3.0)",
 org.apache.commons.logging;version="[1.1.1, 2.0.0)",
 javax.el;version="[1.0.0, 2.0.0)",
--- a/spring-js-resources/pom.xml
+++ b/spring-js-resources/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-js-resources</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring JavaScript Resources</name>
-	<version>2.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>

 	<build>
 	<plugins>
--- 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.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
--- a/spring-webflow-reference/src/spring-webflow-reference.xml
+++ b/spring-webflow-reference/src/spring-webflow-reference.xml
@@ -6,7 +6,7 @@
 		<title>Spring Web Flow Reference Guide</title>
 		<titleabbrev>Spring Web Flow</titleabbrev>
 		<productname>Spring Web Flow</productname>
-		<releaseinfo>Version 2.3.1</releaseinfo>
+		<releaseinfo>Version 2.3.2</releaseinfo>
 		<pubdate></pubdate>
 		<authorgroup>
 			<author>
@@ -29,6 +29,10 @@
 				<firstname>Rossen</firstname>
 				<surname>Stoyanchev</surname>
 			</author>
+			<author>
+				<firstname>Phil</firstname>
+				<surname>Webb</surname>
+			</author>
 		</authorgroup>
 		<legalnotice>
 			<para>
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-faces</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring MVC + Web Flow + JSF/PrimeFaces</name>
-	<version>2.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<properties>
 		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
 		<org.springsecurity-version>3.1.3.RELEASE</org.springsecurity-version>
--- a/spring-webflow-samples/booking-mvc/pom.xml
+++ b/spring-webflow-samples/booking-mvc/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-mvc</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring MVC + Web Flow + JSP</name>
-	<version>2.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<properties>
 		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
 		<org.springsecurity-version>3.1.3.RELEASE</org.springsecurity-version>
--- a/spring-webflow-samples/booking-portlet-faces/pom.xml
+++ b/spring-webflow-samples/booking-portlet-faces/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-portlet-faces</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring Portlet MVC + Web Flow + JSF</name>
-	<version>2.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<properties>
 		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
 		<org.slf4j-version>1.5.10</org.slf4j-version>
--- a/spring-webflow-samples/booking-portlet-mvc/pom.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-portlet-mvc</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring Portlet MVC + Web Flow + JSP</name>
-	<version>2.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<properties>
 		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
 		<org.slf4j-version>1.5.10</org.slf4j-version>
--- a/spring-webflow-samples/jsf-booking/pom.xml
+++ b/spring-webflow-samples/jsf-booking/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>jsf-booking</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring Framework + JSF</name>
-	<version>2.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<properties>
 		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
 		<org.slf4j-version>1.5.10</org.slf4j-version>
--- 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.3.2.BUILD-SNAPSHOT</version>
+	<version>2.3.2.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
--- 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.3.1, 2.4.0)",
- org.springframework.js.*;version="[2.3.1, 2.4.0)",
+ org.springframework.binding.*;version="[2.3.2, 2.4.0)",
+ org.springframework.js.*;version="[2.3.2, 2.4.0)",
 org.springframework.*;version="[3.1.0.RELEASE, 3.3.0)",
 org.springframework.orm.*;version="[3.1.0.RELEASE, 3.3.0)";resolution:=optional,
 org.springframework.transaction.*;version="[3.1.0.RELEASE, 3.3.0)";resolution:=optional,