diff --git a/build.gradle b/build.gradle
index f7e06f37f65..31c6d8f6ca7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -246,30 +246,22 @@ project('spring-context') {
         compile project(":spring-core")
         compile files(project(":spring-core").cglibRepackJar)
         compile("backport-util-concurrent:backport-util-concurrent:3.0", optional)
-        compile("javax.annotation:jsr250-api:1.0", optional)
         compile("javax.ejb:ejb-api:3.0", optional)
         compile("javax.inject:javax.inject:1", optional)
         compile("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1", optional)
-        compile("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1", optional)
         compile("javax.persistence:persistence-api:1.0", optional)
         compile("javax.validation:validation-api:1.0.0.GA", optional)
-        compile("javax.xml.ws:jaxws-api:2.1-1") { dep ->
-            optional dep
-            exclude group: 'javax.jws', module: 'jsr181'
-        }
         compile("org.beanshell:bsh:2.0b4", optional)
-        compile("org.codehaus.groovy:groovy-all:1.6.3", optional)
-        compile("org.hibernate:hibernate-validator:4.2.0.Final") { dep ->
+        compile("org.codehaus.groovy:groovy-all:1.8.8", optional)
+        compile("org.jruby:jruby:1.6.5.1", optional)
+        compile("joda-time:joda-time:2.1", optional)
+        compile("org.slf4j:slf4j-api:1.6.1", optional)
+        compile("org.hibernate:hibernate-validator:4.3.0.Final") { dep ->
             optional dep
             exclude group: 'org.slf4j', module: 'slf4j-api'
         }
-        compile("joda-time:joda-time:1.6", optional)
-        compile("org.jruby:jruby:1.4.0", optional)
-        compile("org.slf4j:slf4j-api:1.6.1", optional)
-        compile("org.codehaus.jsr166-mirror:jsr166:1.7.0", provided)
         compile("org.aspectj:aspectjweaver:${aspectjVersion}", optional)
         testCompile "commons-dbcp:commons-dbcp:1.2.2"
-        testCompile("javax.xml:jaxrpc-api:1.1")
         testCompile("javax.inject:com.springsource.org.atinject.tck:1.0.0")
     }
 
@@ -354,25 +346,24 @@ project('spring-context-support') {
         compile project(":spring-context")
         compile(project(":spring-jdbc"), optional) // for Quartz support
         compile(project(":spring-tx"), optional) // for Quartz support
-        compile("org.codehaus.fabric3.api:commonj:1.1.0", optional)
+        compile("javax.mail:mail:1.4", optional)
         compile("javax.cache:cache-api:0.5", optional)
         compile("net.sf.ehcache:ehcache-core:2.0.0", optional)
         compile("opensymphony:quartz:1.6.2", optional)
-        compile("javax.mail:mail:1.4", optional)
+        compile("org.codehaus.fabric3.api:commonj:1.1.0", optional)
         compile("velocity:velocity:1.5", optional)
-        compile("commons-collections:commons-collections:3.2", optional)
         compile("org.freemarker:freemarker:2.3.15", optional)
+        compile("com.lowagie:itext:2.1.7", optional)
         compile("jasperreports:jasperreports:2.0.5") { dep ->
             optional dep
             transitive = false
         }
-        compile("commons-digester:commons-digester:1.8.1", optional)
-        compile("commons-beanutils:commons-beanutils:1.8.0", optional)
-        compile("com.lowagie:itext:2.0.8", optional)
-        testCompile "hsqldb:hsqldb:${hsqldbVersion}"
         testCompile("org.apache.poi:poi:3.0.2-FINAL") {
             exclude group: 'log4j', module: 'log4j'
         }
+        testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
+        testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
+        testCompile "hsqldb:hsqldb:${hsqldbVersion}"
     }
 
     // pick up **/*.types files in src/main
@@ -395,8 +386,8 @@ project('spring-web') {
         compile("javax.portlet:portlet-api:2.0", provided)
         compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
         compile("javax.servlet.jsp:jsp-api:2.1", provided)
+        compile("javax.xml:jaxrpc-api:1.1")
         compile("javax.xml.soap:saaj-api:1.3", provided)
-        compile("axis:axis:1.4", optional)
         compile("commons-fileupload:commons-fileupload:1.2", optional)
         runtime("commons-io:commons-io:1.3", optional)
         compile("commons-httpclient:commons-httpclient:3.1", optional)