diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml index 90f3428..6e841c0 100644 --- a/booking-faces/pom.xml +++ b/booking-faces/pom.xml @@ -10,10 +10,10 @@ 4.0.0.RELEASE - 3.1.3.RELEASE - 2.4.0.BUILD-SNAPSHOT + 3.2.0.RELEASE + 2.3.3.RELEASE 1.6.1 - 2.2.4 + 2.2.5 4.0 @@ -88,7 +88,7 @@ org.hibernate hibernate-entitymanager - 3.5.0-Final + 3.6.9.Final @@ -217,7 +217,7 @@ org.apache.tomcat.maven tomcat7-maven-plugin - 2.0-SNAPSHOT + 2.2 org.apache.maven.plugins diff --git a/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml b/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml index 085f1ab..09a6009 100644 --- a/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml +++ b/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml @@ -4,7 +4,7 @@ xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd"> + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd"> diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml index a323fea..0469ff0 100644 --- a/booking-mvc/pom.xml +++ b/booking-mvc/pom.xml @@ -9,9 +9,9 @@ 1.0.0.BUILD-SNAPSHOT - 3.2.2.RELEASE - 3.1.3.RELEASE - 2.4.0.M1 + 4.0.0.RELEASE + 3.2.0.RELEASE + 2.3.3.RELEASE 1.7.5 2.0.15 2.0.0 @@ -22,10 +22,15 @@ - spring-repository + spring-milestones SpringSource Repository http://repo.springsource.org/milestone + + spring-snapshots + SpringSource Repository + http://repo.springsource.org/snapshot + @@ -161,7 +166,7 @@ org.hibernate hibernate-entitymanager - 4.2.0.Final + 3.6.9.Final @@ -214,7 +219,7 @@ org.hibernate hibernate-validator - 4.1.0.Beta1 + 4.3.0.Final diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml index 394aece..6a3c53b 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml @@ -26,7 +26,7 @@ - + diff --git a/primefaces-showcase/pom.xml b/primefaces-showcase/pom.xml index efe8145..f8da701 100644 --- a/primefaces-showcase/pom.xml +++ b/primefaces-showcase/pom.xml @@ -9,10 +9,10 @@ 1.0.0-BUILD-SNAPSHOT - 1.5 - 3.2.1.RELEASE - 2.4.0.M1 - 3.1.3.RELEASE + 1.6 + 4.0.0.RELEASE + 2.3.3.RELEASE + 3.2.0.RELEASE 1.6.1 @@ -38,6 +38,21 @@ spring-webmvc ${springframework-version} + + org.springframework.webflow + spring-binding + ${springwebflow-version} + + + org.springframework.webflow + spring-js + ${springwebflow-version} + + + org.springframework.webflow + spring-webflow + ${springwebflow-version} + org.springframework.webflow spring-faces diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml b/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml index 35cd3bb..dad988f 100644 --- a/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml +++ b/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd"> + http://www.springframework.org/schema/security/spring-security-3.2.xsd"> @@ -222,6 +222,7 @@ true true + org.jboss.repository.releases diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml index 343f1c1..34a3126 100644 --- a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml +++ b/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd"> + http://www.springframework.org/schema/security/spring-security-3.2.xsd">