diff --git a/build.gradle b/build.gradle
index 9dae5d418b..a0895a2f17 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,10 +46,10 @@ configure(allprojects) { project ->
 	ext.fileuploadVersion      = "1.3.2"
 	ext.freemarkerVersion      = "2.3.25-incubating"
 	ext.groovyVersion          = "2.4.7"
-	ext.gsonVersion            = "2.7"
+	ext.gsonVersion            = "2.8.0"
 	ext.hamcrestVersion        = "1.3"
 	ext.hibernate5Version      = "5.2.4.Final"
-	ext.hibval5Version         = "5.3.0.Final"
+	ext.hibval5Version         = "5.3.1.Final"
 	ext.hsqldbVersion          = "2.3.4"
 	ext.httpasyncVersion       = "4.1.2"
 	ext.httpclientVersion      = "4.5.2"
@@ -519,13 +519,13 @@ project("spring-context") {
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 		optional("org.beanshell:bsh:2.0b4")
-		testCompile("javax.inject:javax.inject-tck:1")
-		testCompile("javax.el:javax.el-api:${elApiVersion}")
-		testCompile("org.glassfish:javax.el:3.0.1-b08")
-		testCompile("org.javamoney:moneta:1.1")
 		testCompile("org.apache.commons:commons-pool2:2.4.2")
 		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
+		testCompile("javax.inject:javax.inject-tck:1")
 		testRuntime("javax.xml.bind:jaxb-api:${jaxbVersion}")
+		testRuntime("javax.el:javax.el-api:${elApiVersion}")
+		testRuntime("org.glassfish:javax.el:3.0.1-b08")
+		testRuntime("org.javamoney:moneta:1.1")
 	}
 }
 
@@ -822,7 +822,6 @@ project("spring-web-reactive") {
 		testCompile("io.projectreactor.addons:reactor-test:1.0.0.BUILD-SNAPSHOT")
 		testCompile("javax.validation:validation-api:${beanvalVersion}")
 		testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
-		testCompile("javax.el:javax.el-api:${elApiVersion}")
 		testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
 		testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 		testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
@@ -839,6 +838,8 @@ project("spring-web-reactive") {
 		testCompile("com.fasterxml:aalto-xml:1.0.0")
 		testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+		testRuntime("javax.el:javax.el-api:${elApiVersion}")
+		testRuntime("org.glassfish:javax.el:3.0.1-b08")
 		testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
 		testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
 		testRuntime("javax.activation:activation:${activationApiVersion}")
@@ -950,6 +951,7 @@ project("spring-webmvc") {
 		testRuntime("org.jruby:jruby:9.1.5.0")
 		testRuntime("org.python:jython-standalone:2.5.3")
 		testRuntime("org.webjars:underscorejs:1.8.3")
+		testRuntime("org.glassfish:javax.el:3.0.1-b08")
 		testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
 		testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
 		testRuntime("javax.activation:activation:${activationApiVersion}")
@@ -1075,11 +1077,12 @@ project("spring-test") {
 		testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
 		testCompile("javax.cache:cache-api:${cacheApiVersion}")
 		testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
-
 		testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
 		testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}")  // Java Util Logging for JUnit 5
 		testRuntime("org.ehcache:ehcache:${ehcache3Version}")
 		testRuntime("org.terracotta:management-model:2.0.0")
+		testRuntime("javax.el:javax.el-api:${elApiVersion}")
+		testRuntime("org.glassfish:javax.el:3.0.1-b08")
 		testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
 		testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
 	}