From af75a7967da7f9ae62c9c0928cda730a722e3aca Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Tue, 1 Sep 2015 14:17:05 -0400
Subject: [PATCH] Upgrade to 2.4.2.RELEASE

---
 booking-faces/pom.xml                         | 19 ++++++++++++++++---
 booking-mvc/pom.xml                           |  2 +-
 booking-portlet-faces/pom.xml                 |  2 +-
 booking-portlet-mvc/pom.xml                   |  2 +-
 primefaces-showcase/pom.xml                   | 19 +++++++++++++++----
 .../src/main/resources/log4j.xml              |  4 ++--
 webflow-showcase/pom.xml                      |  2 +-
 7 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml
index 640d0b1..5c11114 100644
--- a/booking-faces/pom.xml
+++ b/booking-faces/pom.xml
@@ -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>
diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index c65bae1..5d64e30 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -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>
diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml
index 306f4ba..fc4bf79 100644
--- a/booking-portlet-faces/pom.xml
+++ b/booking-portlet-faces/pom.xml
@@ -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>
diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml
index 10d1199..8f087ae 100644
--- a/booking-portlet-mvc/pom.xml
+++ b/booking-portlet-mvc/pom.xml
@@ -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>
diff --git a/primefaces-showcase/pom.xml b/primefaces-showcase/pom.xml
index b56cb7d..9548a87 100644
--- a/primefaces-showcase/pom.xml
+++ b/primefaces-showcase/pom.xml
@@ -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>
diff --git a/primefaces-showcase/src/main/resources/log4j.xml b/primefaces-showcase/src/main/resources/log4j.xml
index ae5b806..50a9cbe 100644
--- a/primefaces-showcase/src/main/resources/log4j.xml
+++ b/primefaces-showcase/src/main/resources/log4j.xml
@@ -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">
diff --git a/webflow-showcase/pom.xml b/webflow-showcase/pom.xml
index 4f6b607..d02c0cd 100644
--- a/webflow-showcase/pom.xml
+++ b/webflow-showcase/pom.xml
@@ -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>