Spring/spring-webflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Web Flow 2.4 RC1

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-04-02 13:23:09 -04:00
parent 9c1ac50a8c
commit 97f9a3f6ea
6 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
booking-faces/pom.xml
View File

@@ -9,8 +9,9 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.4.0.RC1</webflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<slf4j-version>1.6.1</slf4j-version>
<mojarra-version>2.2.5</mojarra-version>
<primefaces-version>4.0</primefaces-version>
@@ -40,7 +41,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>4.0.2.RELEASE</version>
<version>${spring-framework-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

5
booking-mvc/pom.xml
View File

@@ -9,8 +9,9 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.4.0.RC1</webflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<slf4j-version>1.7.5</slf4j-version>
<thymeleaf-version>2.1.2.RELEASE</thymeleaf-version>
<thymeleaf-extras-tiles2-version>2.1.1.RELEASE</thymeleaf-extras-tiles2-version>
@@ -37,7 +38,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>4.0.2.RELEASE</version>
<version>${spring-framework-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

23
booking-portlet-faces/pom.xml
View File

@@ -9,7 +9,8 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.3.3.RELEASE</webflow-version>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<slf4j-version>1.5.10</slf4j-version>
<myfaces-version>2.1.6</myfaces-version>
</properties>
@@ -27,7 +28,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>4.0.2.RELEASE</version>
<version>${spring-framework-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -43,7 +44,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
@@ -56,10 +57,20 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-binding</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-webflow</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-faces</artifactId>
<version>${webflow-version}</version>
<version>${springwebflow-version}</version>
</dependency>
<!-- Database, JPA -->
<dependency>
@@ -137,7 +148,7 @@
<artifactId>portlet-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
</dependency>
<!-- JSR 303 with Hibernate Validator -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -206,7 +217,7 @@
<downloadJavadocs>false</downloadJavadocs>
<wtpversion>2.0</wtpversion>
</configuration>
</plugin>
</plugin>
</plugins>
</build>
</project>

14
booking-portlet-mvc/pom.xml
View File

@@ -9,7 +9,8 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.3.3.RELEASE</webflow-version>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<slf4j-version>1.5.10</slf4j-version>
</properties>
@@ -26,7 +27,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>4.0.2.RELEASE</version>
<version>${spring-framework-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -55,15 +56,20 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-binding</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-webflow</artifactId>
<version>${webflow-version}</version>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-js</artifactId>
<version>${webflow-version}</version>
<version>${springwebflow-version}</version>
</dependency>
<!-- Logging -->
<dependency>

10
primefaces-showcase/pom.xml
View File

@@ -10,7 +10,8 @@
<properties>
<java-version>1.6</java-version>
<springwebflow-version>2.3.3.RELEASE</springwebflow-version>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<org.slf4j-version>1.6.1</org.slf4j-version>
</properties>
@@ -20,7 +21,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>4.0.2.RELEASE</version>
<version>${spring-framework-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -80,6 +81,11 @@
<artifactId>spring-security-web</artifactId>
<version>${springsecurity-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${springsecurity-version}</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>

5
webflow-showcase/pom.xml
View File

@@ -10,7 +10,8 @@
<properties>
<java-version>1.6</java-version>
<springwebflow-version>2.3.3.RELEASE</springwebflow-version>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<org.slf4j-version>1.5.10</org.slf4j-version>
</properties>
@@ -20,7 +21,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>4.0.2.RELEASE</version>
<version>${spring-framework-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>