diff --git a/build-spring-webflow/resources/changelog.txt b/build-spring-webflow/resources/changelog.txt index d09b25cb..0050bbb0 100644 --- a/build-spring-webflow/resources/changelog.txt +++ b/build-spring-webflow/resources/changelog.txt @@ -2,6 +2,10 @@ SPRING WEB FLOW CHANGELOG ========================= http://www.springframework.org/webflow +Changes in version 2.2.0.RELEASE () +----------------------------------- + + Changes in version 2.1.0.RELEASE (July 19, 2010) ------------------------------------------------ * Extract JSF 2 methods from FlowApplication into Jsf2FlowApplication (SWF-1261). @@ -39,8 +43,8 @@ Changes in version 2.1.0 M1 (May 7, 2010) * Integrate Spring type conversion and formatting (SWF-1234) * Update samples as reference apps for Web Flow on Spring 3 (SWF-1219) -Changes in version 2.0.9 () -------------------------------------- +Changes in version 2.0.9 (Apr 14, 2010) +--------------------------------------- * ViewState now ignores case where 'model' expression fails to evaluate (SWF-1176) * Added calls to lock/unlock the coversation when a flow execution is launched (SWF-1213) * Added serialization methods to FlowFacesMessageAdapter as workaround for issue in MyFaces (SWF-1187) diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt index 0f7a8a3a..8796b47d 100644 --- a/build-spring-webflow/resources/readme.txt +++ b/build-spring-webflow/resources/readme.txt @@ -1,4 +1,4 @@ -SPRING WEB FLOW 2.1.1 +SPRING WEB FLOW 2.2.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.1.1.RELEASE.jar +* org.springframework.webflow-2.2.0.RELEASE.jar - Contents: The Spring Web Flow system - Dependencies: Commons Logging, spring-core, spring-beans, spring-context, spring-expression, 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.1.1.RELEASE.jar +* org.springframework.binding-2.2.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, spring-expression [Log4J, OGNL, EL API] -* org.springframework.js-2.1.1.RELEASE.jar +* org.springframework.js-2.2.0.RELEASE.jar - Contents: The Spring JavaScript module, containing Spring's Dojo integration and additional JavaScript functionality. - Dependencies: Dojo Toolkit -* org.springframework.faces-2.1.1.RELEASE.jar +* org.springframework.faces-2.2.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: org.springframework.webflow org.springframework.binding - 2.1.1.RELEASE + 2.2.0.RELEASE org.springframework.webflow org.springframework.js - 2.1.1.RELEASE + 2.2.0.RELEASE org.springframework.webflow org.springframework.webflow - 2.1.1.RELEASE + 2.2.0.RELEASE If using JavaServerFaces: @@ -122,7 +122,7 @@ If using JavaServerFaces: org.springframework.webflow org.springframework.faces - 2.1.1.RELEASE + 2.2.0.RELEASE 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: - - - + + + If using JavaServerFaces: - + Refer to the reference documentation for more coverage on obtaining Web Flow jars using Maven or Ivy. diff --git a/build.properties b/build.properties index 2b7b004d..e94e4332 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ -version=2.1.1 +version=2.2.0 release.type=integration natural.name=spring-webflow project.key=SWF diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml index b453dbdd..1c45570f 100644 --- a/spring-binding/pom.xml +++ b/spring-binding/pom.xml @@ -5,7 +5,7 @@ spring-binding jar Spring Binding - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT commons-logging diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml index f01b2db9..3e3b75c9 100644 --- a/spring-faces/pom.xml +++ b/spring-faces/pom.xml @@ -5,7 +5,7 @@ spring-faces jar Spring Faces - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT commons-logging diff --git a/spring-faces/template.mf b/spring-faces/template.mf index b46a25ae..c9fcbcb8 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.1.0, 2.1.1)" + org.springframework.webflow.engine.builder.support;version="[2.2.0, 2.3.0)" Import-Template: - 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.binding.*;version="[2.2.0, 2.3.0)", + org.springframework.js.*;version="[2.2.0, 2.3.0)", + org.springframework.webflow.*;version="[2.2.0, 2.3.0)", org.springframework.*;version="[3.0.3.RELEASE, 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 5b07a7a0..bd7d9965 100644 --- a/spring-js/pom.xml +++ b/spring-js/pom.xml @@ -5,7 +5,7 @@ spring-js jar Spring JavaScript - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT commons-logging diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml index 06112caf..e3c469a3 100644 --- a/spring-webflow-samples/booking-faces/pom.xml +++ b/spring-webflow-samples/booking-faces/pom.xml @@ -5,7 +5,7 @@ org.springframework.webflow.samples booking-faces war - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT javax.persistence diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml index 13115c17..fa34f500 100644 --- a/spring-webflow-samples/booking-mvc/pom.xml +++ b/spring-webflow-samples/booking-mvc/pom.xml @@ -5,7 +5,7 @@ org.springframework.webflow.samples booking-mvc war - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT javax.persistence diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml index 2443dc4d..bf986d55 100644 --- a/spring-webflow-samples/booking-portlet-faces/pom.xml +++ b/spring-webflow-samples/booking-portlet-faces/pom.xml @@ -5,7 +5,7 @@ org.springframework.webflow.samples booking-portlet-faces war - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT com.sun.facelets diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml index 30759373..b00315cb 100644 --- a/spring-webflow-samples/booking-portlet-mvc/pom.xml +++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml @@ -5,7 +5,7 @@ org.springframework.webflow.samples booking-portlet-mvc war - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT javax.persistence diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml index 5531352a..7ef8f381 100644 --- a/spring-webflow-samples/jsf-booking/pom.xml +++ b/spring-webflow-samples/jsf-booking/pom.xml @@ -5,7 +5,7 @@ org.springframework.webflow.samples jsf-booking war - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT javax.faces diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml index 5b85b394..52024b42 100644 --- a/spring-webflow/pom.xml +++ b/spring-webflow/pom.xml @@ -5,7 +5,7 @@ spring-webflow jar Spring Web Flow - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT commons-logging diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf index b9b441cd..c03dfc15 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.1.0, 2.1.1)", - org.springframework.js.*;version="[2.1.0, 2.1.1)", + org.springframework.binding.*;version="[2.2.0, 2.3.0)", + org.springframework.js.*;version="[2.2.0, 2.3.0)", org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)", org.springframework.orm.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional, org.springframework.transaction.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional,