diff --git a/build.gradle b/build.gradle
index c2de2e36e8d..258b8c40854 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,58 +31,59 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	ext.aspectjVersion       = "1.8.9"
-	ext.beanvalVersion       = "1.1.0.Final"
-	ext.caffeineVersion      = "2.3.1"
-	ext.eclipselinkVersion   = "2.6.3"
-	ext.ehcacheVersion       = "2.10.2"
-	ext.ehcachejcacheVersion = "1.0.1"
-	ext.ehcache3Version      = "3.1.0"
-	ext.ejbVersion           = "3.2"
-	ext.fileuploadVersion    = "1.3.2"
-	ext.freemarkerVersion    = "2.3.23"
-	ext.groovyVersion        = "2.4.7"
-	ext.gsonVersion          = "2.7"
-	ext.hamcrestVersion      = "1.3"
-	ext.hibernate5Version    = "5.2.1.Final"
-	ext.hibval5Version       = "5.2.4.Final"
-	ext.hsqldbVersion        = "2.3.4"
-	ext.httpasyncVersion     = "4.1.2"
-	ext.httpclientVersion    = "4.5.2"
-	ext.jackson2Version      = "2.8.0"
-	ext.javamailVersion      = "1.5.5"
-	ext.jcaVersion           = "1.7"
-	ext.jettyVersion         = "9.3.10.v20160621"
-	ext.jodaVersion          = "2.9.4"
-	ext.jpaVersion           = "2.1.1"
-	ext.jspVersion           = "2.3.2-b02"
-	ext.jtaVersion           = "1.2"
-	ext.junitVersion         = "4.12"
-	ext.junitJupiterVersion  = '5.0.0-M1'
-	ext.junitPlatformVersion = '1.0.0-M1'
-	ext.log4jVersion         = '2.6.1'
-	ext.nettyVersion         = "4.1.3.Final"
-	ext.okhttpVersion        = "2.7.5"
-	ext.okhttp3Version       = "3.3.1"
-	ext.poiVersion           = "3.14"
-	ext.reactorVersion       = "2.0.8.RELEASE"
-	ext.reactorCoreVersion   = '3.0.0.BUILD-SNAPSHOT'
-	ext.reactorNettyVersion  = '0.5.0.BUILD-SNAPSHOT'
-	ext.rxJavaVersion        = '1.1.6'
-	ext.romeVersion          = "1.6.0"
-	ext.servletVersion       = "3.1.0"
-	ext.slf4jVersion         = "1.7.21"
-	ext.snakeyamlVersion     = "1.17"
-	ext.snifferVersion       = "1.15"
-	ext.testngVersion        = "6.9.10"
-	ext.tiles3Version        = "3.0.5"
-	ext.tomcatVersion        = "8.5.4"
-	ext.tyrusVersion         = "1.13"
-	ext.undertowVersion      = "1.4.0.CR3"
-	ext.websocketVersion     = "1.1"
-	ext.woodstoxVersion      = "5.0.2"
-	ext.xmlunitVersion       = "1.6"
-	ext.xstreamVersion       = "1.4.9"
+	ext.aspectjVersion        = "1.8.9"
+	ext.beanvalVersion        = "1.1.0.Final"
+	ext.caffeineVersion       = "2.3.1"
+	ext.eclipselinkVersion    = "2.6.3"
+	ext.ehcacheVersion        = "2.10.2"
+	ext.ehcachejcacheVersion  = "1.0.1"
+	ext.ehcache3Version       = "3.1.0"
+	ext.ejbVersion            = "3.2"
+	ext.fileuploadVersion     = "1.3.2"
+	ext.freemarkerVersion     = "2.3.23"
+	ext.groovyVersion         = "2.4.7"
+	ext.gsonVersion           = "2.7"
+	ext.hamcrestVersion       = "1.3"
+	ext.hibernate5Version     = "5.2.1.Final"
+	ext.hibval5Version        = "5.2.4.Final"
+	ext.hsqldbVersion         = "2.3.4"
+	ext.httpasyncVersion      = "4.1.2"
+	ext.httpclientVersion     = "4.5.2"
+	ext.interceptorApiVersion = "1.2"
+	ext.jackson2Version       = "2.8.0"
+	ext.javamailVersion       = "1.5.5"
+	ext.jcaVersion            = "1.7"
+	ext.jettyVersion          = "9.3.10.v20160621"
+	ext.jodaVersion           = "2.9.4"
+	ext.jpaVersion            = "2.1.1"
+	ext.jspVersion            = "2.3.2-b02"
+	ext.jtaVersion            = "1.2"
+	ext.junitVersion          = "4.12"
+	ext.junitJupiterVersion   = '5.0.0-M1'
+	ext.junitPlatformVersion  = '1.0.0-M1'
+	ext.log4jVersion          = '2.6.1'
+	ext.nettyVersion          = "4.1.3.Final"
+	ext.okhttpVersion         = "2.7.5"
+	ext.okhttp3Version        = "3.3.1"
+	ext.poiVersion            = "3.14"
+	ext.reactorVersion        = "2.0.8.RELEASE"
+	ext.reactorCoreVersion    = '3.0.0.BUILD-SNAPSHOT'
+	ext.reactorNettyVersion   = '0.5.0.BUILD-SNAPSHOT'
+	ext.rxJavaVersion         = '1.1.6'
+	ext.romeVersion           = "1.6.0"
+	ext.servletVersion        = "3.1.0"
+	ext.slf4jVersion          = "1.7.21"
+	ext.snakeyamlVersion      = "1.17"
+	ext.snifferVersion        = "1.15"
+	ext.testngVersion         = "6.9.10"
+	ext.tiles3Version         = "3.0.5"
+	ext.tomcatVersion         = "8.5.4"
+	ext.tyrusVersion          = "1.13"
+	ext.undertowVersion       = "1.4.0.CR3"
+	ext.websocketVersion      = "1.1"
+	ext.woodstoxVersion       = "5.0.2"
+	ext.xmlunitVersion        = "1.6"
+	ext.xstreamVersion        = "1.4.9"
 
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
 
@@ -481,6 +482,7 @@ project("spring-context") {
 		optional("javax.inject:javax.inject:1")
 		optional("javax.ejb:javax.ejb-api:${ejbVersion}")
 		optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
+		optional("javax.interceptor:javax.interceptor-api:${interceptorApiVersion}")
 		optional("javax.money:money-api:1.0")
 		optional("org.eclipse.persistence:javax.persistence:${jpaVersion}")
 		optional("javax.validation:validation-api:${beanvalVersion}")
@@ -549,6 +551,7 @@ project("spring-tx") {
 		optional("javax.transaction:javax.transaction-api:${jtaVersion}")
 		optional("javax.resource:javax.resource-api:${jcaVersion}")
 		optional("javax.ejb:javax.ejb-api:${ejbVersion}")
+		optional("javax.interceptor:javax.interceptor-api:${interceptorApiVersion}")
 		optional("com.ibm.websphere:uow:6.0.2.17")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 		testCompile("org.eclipse.persistence:javax.persistence:${jpaVersion}")
@@ -953,6 +956,7 @@ project("spring-test") {
 		testCompile(project(":spring-oxm"))
 		testCompile("javax.mail:javax.mail-api:${javamailVersion}")
 		testCompile("javax.ejb:javax.ejb-api:${ejbVersion}")
+		testCompile("javax.interceptor:javax.interceptor-api:${interceptorApiVersion}")
 		testCompile("org.hibernate:hibernate-core:${hibernate5Version}")
 		testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
 		// Enable use of the JUnitPlatform Runner