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

Upgrade to 2.4.2.RELEASE

Browse Source
This commit is contained in:
Rossen Stoyanchev
2015-09-01 14:17:05 -04:00
parent e79d45485b
commit af75a7967d
7 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
booking-faces/pom.xml
View File

@@ -9,11 +9,11 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.4.2.BUILD-SNAPSHOT</webflow-version>
<webflow-version>2.4.2.RELEASE</webflow-version>
<spring-framework-version>4.1.6.RELEASE</spring-framework-version>
<springsecurity-version>4.0.1.RELEASE</springsecurity-version>
<slf4j-version>1.6.1</slf4j-version>
<mojarra-version>2.2.5</mojarra-version>
<mojarra-version>2.2.12</mojarra-version>
<primefaces-version>5.0</primefaces-version>
</properties>
@@ -94,7 +94,7 @@
<artifactId>hibernate-entitymanager</artifactId>
<version>3.6.9.Final</version>
</dependency>
<!-- JSF: Mojarra, PrimeFaces -->
<!-- JSF implementation: Mojarra -->
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
@@ -105,6 +105,19 @@
<artifactId>jsf-impl</artifactId>
<version>${mojarra-version}</version>
</dependency>
<!-- JSF implementation: MyFaces
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.2.8</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>2.2.8</version>
</dependency>
-->
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>

2
booking-mvc/pom.xml
View File

@@ -9,7 +9,7 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.4.2.BUILD-SNAPSHOT</webflow-version>
<webflow-version>2.4.2.RELEASE</webflow-version>
<spring-framework-version>4.1.6.RELEASE</spring-framework-version>
<springsecurity-version>4.0.1.RELEASE</springsecurity-version>
<slf4j-version>1.7.5</slf4j-version>

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

@@ -9,7 +9,7 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springwebflow-version>2.4.2.BUILD-SNAPSHOT</springwebflow-version>
<springwebflow-version>2.4.2.RELEASE</springwebflow-version>
<spring-framework-version>4.1.6.RELEASE</spring-framework-version>
<slf4j-version>1.7.5</slf4j-version>
<mojarra-version>2.2.6</mojarra-version>

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

@@ -9,7 +9,7 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springwebflow-version>2.4.2.BUILD-SNAPSHOT</springwebflow-version>
<springwebflow-version>2.4.2.RELEASE</springwebflow-version>
<spring-framework-version>4.1.6.RELEASE</spring-framework-version>
<slf4j-version>1.7.5</slf4j-version>
</properties>

19
primefaces-showcase/pom.xml
View File

@@ -10,7 +10,7 @@
<properties>
<java-version>1.6</java-version>
<springwebflow-version>2.4.2.BUILD-SNAPSHOT</springwebflow-version>
<springwebflow-version>2.4.2.RELEASE</springwebflow-version>
<springsecurity-version>4.0.1.RELEASE</springsecurity-version>
<primefaces-version>4.0</primefaces-version>
<org.slf4j-version>1.7.5</org.slf4j-version>
@@ -138,13 +138,24 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.1.7</version>
<version>2.2.12</version>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>2.1.7</version>
<version>2.2.12</version>
</dependency>
<!-- Apache MyFaces JSF 2 runtime -->
<!--<dependency>-->
<!--<groupId>org.apache.myfaces.core</groupId>-->
<!--<artifactId>myfaces-api</artifactId>-->
<!--<version>2.2.8</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.myfaces.core</groupId>-->
<!--<artifactId>myfaces-impl</artifactId>-->
<!--<version>2.2.8</version>-->
<!--</dependency>-->
<!-- PrimeFaces component library -->
<dependency>
<groupId>org.primefaces</groupId>
@@ -171,7 +182,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.0.2.GA</version>
<version>4.3.0.Final</version>
</dependency>
<!-- Test -->
<dependency>

4
primefaces-showcase/src/main/resources/log4j.xml
View File

@@ -18,7 +18,7 @@
</logger>
<logger name="org.springframework.binding">
<level value="info" />
<level value="debug" />
</logger>
<logger name="org.springframework.webflow">
@@ -26,7 +26,7 @@
</logger>
<logger name="org.springframework.security">
<level value="debug" />
<level value="info" />
</logger>
<logger name="org.primefaces">

2
webflow-showcase/pom.xml
View File

@@ -10,7 +10,7 @@
<properties>
<java-version>1.6</java-version>
<springwebflow-version>2.4.2.BUILD-SNAPSHOT</springwebflow-version>
<springwebflow-version>2.4.2.RELEASE</springwebflow-version>
<springsecurity-version>4.0.1.RELEASE</springsecurity-version>
<org.slf4j-version>1.7.5</org.slf4j-version>
</properties>