diff --git a/build-spring-webflow/resources/changelog.txt b/build-spring-webflow/resources/changelog.txt index d88769b9..70a22387 100644 --- 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 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 diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt index 340818a5..d9bdba8b 100644 --- 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): org.springframework.webflow spring-binding - 2.3.1.RELEASE + 2.3.2.RELEASE org.springframework.webflow spring-js - 2.3.1.RELEASE + 2.3.2.RELEASE org.springframework.webflow spring-webflow - 2.3.1.RELEASE + 2.3.2.RELEASE If using JSF all you need to include is: @@ -121,7 +121,7 @@ If using JSF all you need to include is: org.springframework.webflow spring-faces - 2.3.1.RELEASE + 2.3.2.RELEASE To access jars using Ivy, add the following repositories to your Ivy config: diff --git a/build.properties b/build.properties index 9c8b51c9..7b42fa48 100644 --- 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 diff --git a/pom.xml b/pom.xml index b37353c3..19a1d5e6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-webflow-root pom Spring Web Flow - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE spring-binding spring-js-resources diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml index 9d0a911a..dfac410f 100644 --- a/spring-binding/pom.xml +++ b/spring-binding/pom.xml @@ -5,7 +5,7 @@ spring-binding jar Spring Binding - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE commons-logging diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml index 5b33a324..46d4f707 100644 --- a/spring-faces/pom.xml +++ b/spring-faces/pom.xml @@ -5,7 +5,7 @@ spring-faces jar Spring Faces - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE commons-logging diff --git a/spring-faces/template.mf b/spring-faces/template.mf index 03b89ef6..f51ca878 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.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)", diff --git a/spring-js-resources/pom.xml b/spring-js-resources/pom.xml index 57d7b82f..90c04d62 100644 --- a/spring-js-resources/pom.xml +++ b/spring-js-resources/pom.xml @@ -5,7 +5,7 @@ spring-js-resources jar Spring JavaScript Resources - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE diff --git a/spring-js/pom.xml b/spring-js/pom.xml index ac7f2f39..97e3e208 100644 --- a/spring-js/pom.xml +++ b/spring-js/pom.xml @@ -5,7 +5,7 @@ spring-js jar Spring JavaScript - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE commons-logging diff --git a/spring-webflow-reference/src/spring-webflow-reference.xml b/spring-webflow-reference/src/spring-webflow-reference.xml index 91b45a3f..90e4471b 100644 --- a/spring-webflow-reference/src/spring-webflow-reference.xml +++ b/spring-webflow-reference/src/spring-webflow-reference.xml @@ -6,7 +6,7 @@ Spring Web Flow Reference Guide Spring Web Flow Spring Web Flow - Version 2.3.1 + Version 2.3.2 @@ -29,6 +29,10 @@ Rossen Stoyanchev + + Phil + Webb + diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml index ed5bd463..7c340da4 100644 --- a/spring-webflow-samples/booking-faces/pom.xml +++ b/spring-webflow-samples/booking-faces/pom.xml @@ -6,7 +6,7 @@ booking-faces war Hotel Booking : Spring MVC + Web Flow + JSF/PrimeFaces - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE 3.2.1.RELEASE 3.1.3.RELEASE diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml index db9e88f7..eb82a14e 100644 --- a/spring-webflow-samples/booking-mvc/pom.xml +++ b/spring-webflow-samples/booking-mvc/pom.xml @@ -6,7 +6,7 @@ booking-mvc war Hotel Booking : Spring MVC + Web Flow + JSP - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE 3.2.1.RELEASE 3.1.3.RELEASE diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml index a7d44c05..81f35b47 100644 --- a/spring-webflow-samples/booking-portlet-faces/pom.xml +++ b/spring-webflow-samples/booking-portlet-faces/pom.xml @@ -6,7 +6,7 @@ booking-portlet-faces war Hotel Booking : Spring Portlet MVC + Web Flow + JSF - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE 3.2.1.RELEASE 1.5.10 diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml index 151a9acd..0ad8678e 100644 --- a/spring-webflow-samples/booking-portlet-mvc/pom.xml +++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml @@ -6,7 +6,7 @@ booking-portlet-mvc war Hotel Booking : Spring Portlet MVC + Web Flow + JSP - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE 3.2.1.RELEASE 1.5.10 diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml index 56f7ad61..60d49d3f 100644 --- a/spring-webflow-samples/jsf-booking/pom.xml +++ b/spring-webflow-samples/jsf-booking/pom.xml @@ -6,7 +6,7 @@ jsf-booking war Hotel Booking : Spring Framework + JSF - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE 3.2.1.RELEASE 1.5.10 diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml index d6c8bc91..3e2407dd 100644 --- a/spring-webflow/pom.xml +++ b/spring-webflow/pom.xml @@ -5,7 +5,7 @@ spring-webflow jar Spring Web Flow - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE commons-logging diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf index afa78111..b7690cd3 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.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,