Consistent use of annotation-api dependency instead of tomcat-embed-core

spring-beans/spring-beans.gradle

@@ -9,7 +9,7 @@ dependencies {
 	optional("org.codehaus.groovy:groovy-xml:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
+	testCompile("javax.annotation:javax.annotation-api:1.3.2")
 }
 
 // This module does joint compilation for Java and Groovy code with the compileGroovy task.

spring-core/spring-core.gradle

@@ -79,7 +79,6 @@ dependencies {
 	optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
 	optional("io.netty:netty-buffer")
 	testCompile("io.projectreactor:reactor-test")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 	testCompile("javax.annotation:javax.annotation-api:1.3.2")
 	testCompile("com.google.code.findbugs:jsr305:3.0.2")
 	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")