diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml index ea56105..8786846 100644 --- a/booking-faces/pom.xml +++ b/booking-faces/pom.xml @@ -42,13 +42,6 @@ org.springframework spring-context ${springframework-version} - - - - commons-logging - commons-logging - - org.springframework @@ -74,33 +67,11 @@ org.springframework.security spring-security-web ${springsecurity-version} - - - - commons-logging - commons-logging - - - org.springframework - * - - org.springframework.security spring-security-config ${springsecurity-version} - - - - commons-logging - commons-logging - - - org.springframework - * - - @@ -246,7 +217,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.8 + 2.9 true false diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml index 99b5b87..9b7569b 100644 --- a/booking-portlet-faces/pom.xml +++ b/booking-portlet-faces/pom.xml @@ -29,13 +29,6 @@ org.springframework spring-context ${springframework-version} - - - - commons-logging - commons-logging - - org.springframework diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml index ba1d1b1..d74bf3e 100644 --- a/booking-portlet-mvc/pom.xml +++ b/booking-portlet-mvc/pom.xml @@ -28,13 +28,6 @@ org.springframework spring-context ${springframework-version} - - - - commons-logging - commons-logging - - org.springframework diff --git a/pom.xml b/pom.xml index 42580fb..54c0048 100644 --- a/pom.xml +++ b/pom.xml @@ -12,5 +12,7 @@ booking-faces booking-portlet-mvc booking-portlet-faces + primefaces-showcase + webflow-showcase diff --git a/primefaces-showcase/pom.xml b/primefaces-showcase/pom.xml index 292ce64..efe8145 100644 --- a/primefaces-showcase/pom.xml +++ b/primefaces-showcase/pom.xml @@ -11,23 +11,32 @@ 1.5 3.2.1.RELEASE - 2.4.0.BUILD-SNAPSHOT + 2.4.0.M1 3.1.3.RELEASE 1.6.1 + + org.springframework + spring-aop + ${springframework-version} + + + org.springframework + spring-context + ${springframework-version} + + + org.springframework + spring-web + ${springframework-version} + org.springframework spring-webmvc ${springframework-version} - - - commons-logging - commons-logging - - org.springframework.webflow @@ -41,7 +50,7 @@ org.springframework - * + spring-aop @@ -52,7 +61,7 @@ org.springframework - * + spring-aop @@ -63,7 +72,7 @@ org.springframework - * + spring-aop @@ -164,30 +173,28 @@ - springsource SpringSource Repository - http://repo.springsource.org/release + http://repo.springsource.org/milestone true true - jboss - JBoss Maven Release Repository + JBoss Repository https://repository.jboss.org/nexus/content/repositories/releases false java.net - Java.net Repository for Maven + Java.net Repository http://download.java.net/maven/2/ false primefaces - Prime Technology Maven Repository + Prime Technology Repository http://repository.primefaces.org default @@ -206,7 +213,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.8 + 2.9 true false diff --git a/webflow-showcase/pom.xml b/webflow-showcase/pom.xml index 82fe555..e4cc1c1 100644 --- a/webflow-showcase/pom.xml +++ b/webflow-showcase/pom.xml @@ -18,16 +18,25 @@ + + org.springframework + spring-aop + ${springframework-version} + + + org.springframework + spring-context + ${springframework-version} + + + org.springframework + spring-web + ${springframework-version} + org.springframework spring-webmvc ${springframework-version} - - - commons-logging - commons-logging - - org.springframework @@ -54,14 +63,9 @@ spring-security-web ${springsecurity-version} - - - commons-logging - commons-logging - org.springframework - * + spring-aop @@ -72,7 +76,7 @@ org.springframework - * + spring-aop @@ -81,14 +85,9 @@ spring-security-config ${springsecurity-version} - - - commons-logging - commons-logging - org.springframework - * + spring-aop @@ -244,7 +243,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.8 + 2.9 true false