diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml index 1acbeb3..84273a0 100644 --- a/booking-faces/pom.xml +++ b/booking-faces/pom.xml @@ -9,7 +9,7 @@ 1.0.0.BUILD-SNAPSHOT - 3.2.0.RELEASE + 3.2.1.RELEASE 3.1.3.RELEASE 2.4.0.BUILD-SNAPSHOT 1.5.10 @@ -33,6 +33,11 @@ + + org.springframework + spring-aop + ${springframework-version} + org.springframework spring-context @@ -75,6 +80,10 @@ commons-logging commons-logging + + org.springframework + * + @@ -87,6 +96,10 @@ commons-logging commons-logging + + org.springframework + * + @@ -203,7 +216,7 @@ - swf-booking-faces + booking-faces 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 3dae3ca..085f1ab 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 @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml index b15bf83..b5581ad 100644 --- a/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml +++ b/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml @@ -1,6 +1,7 @@ @@ -32,4 +33,4 @@ - \ No newline at end of file + diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml index 51141df..f41fb3f 100644 --- a/booking-mvc/pom.xml +++ b/booking-mvc/pom.xml @@ -9,7 +9,7 @@ 1.0.0.BUILD-SNAPSHOT - 3.2.0.RELEASE + 3.2.1.RELEASE 3.1.3.RELEASE 2.4.0.BUILD-SNAPSHOT 1.5.10 @@ -66,13 +66,23 @@ commons-logging commons-logging + + + org.springframework + * - + org.springframework.security spring-security-taglibs ${springsecurity-version} + + + org.springframework + * + + org.springframework.security @@ -83,6 +93,10 @@ commons-logging commons-logging + + + org.springframework + * diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml index f435a97..cd84b62 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml index 3eba02b..c0e4f4f 100644 --- a/booking-portlet-faces/pom.xml +++ b/booking-portlet-faces/pom.xml @@ -9,8 +9,7 @@ 1.0.0.BUILD-SNAPSHOT - 3.2.0.RELEASE - 2.3.1.RELEASE + 3.2.1.RELEASE 2.4.0.BUILD-SNAPSHOT 1.5.10 2.1.6 diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml index b9655f6..310a22c 100644 --- a/booking-portlet-mvc/pom.xml +++ b/booking-portlet-mvc/pom.xml @@ -9,8 +9,7 @@ 1.0.0.BUILD-SNAPSHOT - 3.2.0.RELEASE - 2.3.1.RELEASE + 3.2.1.RELEASE 2.4.0.BUILD-SNAPSHOT 1.5.10