diff --git a/web/pom.xml b/web/pom.xml index 7259c06230..5556d2ddfe 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -61,12 +61,6 @@ 3.2.0.CI-SNAPSHOT compile - - org.springframework - spring-aop - 3.2.3.RELEASE - compile - org.springframework spring-beans @@ -98,28 +92,24 @@ compile - org.springframework - spring-jdbc - 3.2.3.RELEASE + commons-logging + commons-logging + 1.1.1 compile + true org.springframework - spring-tx + spring-jdbc 3.2.3.RELEASE compile + true org.springframework - spring-web + spring-tx 3.2.3.RELEASE compile - - - commons-logging - commons-logging - 1.1.1 - compile true diff --git a/web/web.gradle b/web/web.gradle index afed22fa61..046872b8ab 100644 --- a/web/web.gradle +++ b/web/web.gradle @@ -3,15 +3,14 @@ apply plugin: 'groovy' dependencies { compile project(':spring-security-core'), 'aopalliance:aopalliance:1.0', - "org.springframework:spring-aop:$springVersion", "org.springframework:spring-beans:$springVersion", "org.springframework:spring-context:$springVersion", - "org.springframework:spring-expression:$springVersion", - "org.springframework:spring-jdbc:$springVersion", - "org.springframework:spring-tx:$springVersion", + "org.springframework:spring-expression:$springVersion" "org.springframework:spring-web:$springVersion" - optional "org.springframework:spring-webmvc:$springVersion" + optional "org.springframework:spring-webmvc:$springVersion", + "org.springframework:spring-jdbc:$springVersion", + "org.springframework:spring-tx:$springVersion" provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion"