diff --git a/build.gradle b/build.gradle
index 64fc1017da2..92bbf251142 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,12 +22,12 @@ configure(allprojects) { project ->
 	ext.jackson1Version      = "1.9.13"
 	ext.jackson2Version      = "2.3.3"
 	ext.jasperReportsVersion = "5.5.1"
-	ext.jettyVersion         = "9.1.4.v20140401"
+	ext.jettyVersion         = "9.1.5.v20140505"
 	ext.jodaVersion          = "2.3"
 	ext.junitVersion         = "4.11"
 	ext.slf4jVersion         = "1.7.7"
 	ext.tiles2Version        = "2.2.2"
-	ext.tiles3Version        = "3.0.3"
+	ext.tiles3Version        = "3.0.4"
 	ext.tomcatVersion        = "8.0.5"
 	ext.xstreamVersion       = "1.4.7"
 
@@ -527,7 +527,7 @@ project("spring-context-support") {
 		compile(project(":spring-context"))
 		optional(project(":spring-jdbc")) // for Quartz support
 		optional(project(":spring-tx")) // for Quartz support
-		optional("javax.mail:mail:1.4.7")
+		optional("javax.mail:javax.mail-api:1.4.7")
 		optional("javax.cache:cache-api:1.0.0")
 		optional("com.google.guava:guava:17.0")
 		optional("net.sf.ehcache:ehcache-core:2.6.5")
@@ -538,12 +538,15 @@ project("spring-context-support") {
 		optional("org.apache.velocity:velocity:1.7")
 		optional("org.freemarker:freemarker:2.3.20")
 		optional("com.lowagie:itext:2.1.7")
-		optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion")
+		optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") {
+			exclude group: "xml-apis", module: "xml-apis"
+		}
 		testCompile("org.apache.poi:poi:3.10-FINAL")
 		testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
 		testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
 		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
+		testRuntime("com.sun.mail:javax.mail:1.4.7")
 	}
 
 	// pick up **/*.types files in src/main
@@ -560,7 +563,7 @@ project("spring-web") {
 		compile(project(":spring-core"))
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
-		optional("javax.servlet.jsp:jsp-api:2.2")
+		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
 		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:javax.el-api:2.2.4")
 		optional("javax.faces:javax.faces-api:2.2")
@@ -572,7 +575,6 @@ project("spring-web") {
 		optional("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		optional("rome:rome:1.0")
-		optional("taglibs:standard:1.1.2")
 		optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
 			exclude group: "javax.servlet", module: "javax.servlet-api"
 		}
@@ -583,6 +585,9 @@ project("spring-web") {
 		testCompile(project(":spring-context-support"))  // for JafMediaTypeFactory
 		testCompile("xmlunit:xmlunit:1.5")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+		testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
+			exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
+		}
 	}
 
 	// pick up ContextLoader.properties in src/main
@@ -700,8 +705,8 @@ project("spring-webmvc") {
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		optional(project(":spring-context-support")) // for Velocity support
 		optional(project(":spring-oxm")) // for MarshallingView
-		optional("javax.servlet.jsp:jsp-api:2.2")
-		optional("javax.servlet:jstl:1.2")
+		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
+		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
 		optional("net.sourceforge.jexcelapi:jxl:2.6.12")
 		optional("org.apache.poi:poi:3.10-FINAL")
 		optional("org.apache.velocity:velocity:1.7")
@@ -770,8 +775,8 @@ project("spring-webmvc-tiles3") {
 		provided(project(":spring-context"))
 		provided(project(":spring-web"))
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		optional("javax.servlet.jsp:jsp-api:2.2")
-		optional("javax.servlet:jstl:1.2")
+		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
+		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
 		optional("javax.el:javax.el-api:2.2.4")
 		optional("org.apache.tiles:tiles-api:${tiles3Version}")
 		optional("org.apache.tiles:tiles-core:${tiles3Version}") {
@@ -829,8 +834,11 @@ project("spring-test") {
 		optional("org.testng:testng:6.8.8")
 		optional("javax.inject:javax.inject:1")
 		optional("javax.servlet:javax.servlet-api:3.0.1")
-		optional("javax.servlet.jsp:jsp-api:2.2")
-		optional("javax.servlet:jstl:1.2")
+		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
+		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
+		optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
+			exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
+		}
 		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:javax.el-api:2.2.4")
 		optional("org.eclipse.persistence:javax.persistence:2.0.0")
@@ -904,7 +912,7 @@ project("spring-aspects") {
 		optional(project(":spring-tx")) // for JPA, @Transactional support
 		testCompile(project(":spring-core")) // for CodeStyleAspect
 		testCompile(project(":spring-test"))
-		testCompile("javax.mail:mail:1.4.7")
+		testCompile("javax.mail:javax.mail-api:1.4.7")
 	}
 
 	eclipse.project {