diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml index 3c17ea0..a323fea 100644 --- a/booking-mvc/pom.xml +++ b/booking-mvc/pom.xml @@ -9,10 +9,10 @@ 1.0.0.BUILD-SNAPSHOT - 3.2.1.RELEASE + 3.2.2.RELEASE 3.1.3.RELEASE 2.4.0.M1 - 1.6.1 + 1.7.5 2.0.15 2.0.0 2.0.0 @@ -62,6 +62,12 @@ org.springframework spring-web ${springframework-version} + + + commons-logging + commons-logging + + org.springframework @@ -78,48 +84,47 @@ spring-orm ${springframework-version} + + org.springframework + spring-aop + ${springframework-version} + org.springframework.webflow spring-webflow ${webflow-version} + + + commons-logging + commons-logging + + org.springframework.webflow spring-js ${webflow-version} + + + commons-logging + commons-logging + + org.springframework.security spring-security-web ${springsecurity-version} - - - org.springframework - spring-aop - - org.springframework.security spring-security-taglibs ${springsecurity-version} - - - org.springframework - spring-aop - - org.springframework.security spring-security-config - ${springsecurity-version} - - - org.springframework - spring-aop - - + ${springsecurity-version} @@ -142,25 +147,7 @@ log4j log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - + 1.2.16 runtime @@ -168,13 +155,13 @@ org.hsqldb hsqldb - 1.8.0.10 + 2.2.9 runtime org.hibernate hibernate-entitymanager - 3.5.0-Final + 4.2.0.Final @@ -244,12 +231,12 @@ joda-time joda-time - 1.6 + 2.2 joda-time joda-time-jsptags - 1.0.2 + 1.1.1 runtime @@ -257,13 +244,13 @@ org.easymock easymock - 2.5.2 + 3.1 test junit junit - 3.8.2 + 4.11 test @@ -280,7 +267,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.0 1.6 1.6 @@ -289,7 +276,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 + 2.14 junit:junit @@ -300,7 +287,12 @@ org.apache.tomcat.maven tomcat7-maven-plugin - 2.0-SNAPSHOT + 2.1 + + + org.eclipse.jetty + jetty-maven-plugin + 9.0.0.v20130308 org.apache.maven.plugins