Fold spring-test-mvc sources into spring-test

With spring-test compiling against Servlet 3.0 it is no longer required
to compile Spring MVC Test sources separately (from spring-test).

build.gradle

@@ -780,12 +780,33 @@ project("spring-test") {
 		optional("javax.portlet:portlet-api:2.0")
 		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("org.hibernate:hibernate-core:3.6.9.Final")
 		provided("javax.inject:javax.inject:1")
 		provided("javax.activation:activation:1.1")
 		provided("javax.servlet:jstl:1.2")
+		optional("org.hamcrest:hamcrest-core:1.3")
+		optional("com.jayway.jsonpath:json-path:0.9.0")
+		optional("xmlunit:xmlunit:1.3")
+		testCompile(project(":spring-context-support"))
+		testCompile(project(":spring-oxm"))
+		testCompile(project(":spring-webmvc-tiles3"))
+		testCompile("org.hibernate:hibernate-core:3.6.9.Final")
 		testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
+		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
+		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
+		testCompile("com.fasterxml.jackson.core:jackson-databind:2.2.2")
+		testCompile("com.thoughtworks.xstream:xstream:1.4.4")
+		testCompile("rome:rome:1.0")
+		testCompile("javax.activation:activation:1.1")
+		testCompile("javax.mail:mail:1.4.7")
+		testCompile("org.apache.tiles:tiles-request-api:1.0.1")
+		testCompile("org.apache.tiles:tiles-api:3.0.1")
+		testCompile("org.apache.tiles:tiles-core:3.0.1") {
+			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+		}
+		testCompile("org.apache.tiles:tiles-servlet:3.0.1") {
+			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+		}
 	}
 
 	task testNG(type: Test) {
@@ -808,40 +829,6 @@ project("spring-test") {
 	}
 }
 
-project("spring-test-mvc") {
-	description = "Spring Test MVC Framework"
-	merge.into = project(":spring-test")
-
-	dependencies {
-		optional(project(":spring-context"))
-		provided(project(":spring-webmvc"))
-		provided(project(":spring-webmvc-tiles3"))
-		provided("javax.servlet:javax.servlet-api:3.0.1")
-		optional("org.hamcrest:hamcrest-core:1.3")
-		optional("com.jayway.jsonpath:json-path:0.9.0")
-		optional("xmlunit:xmlunit:1.3")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("javax.servlet:jstl:1.2")
-		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
-		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
-		testCompile("com.fasterxml.jackson.core:jackson-databind:2.2.2")
-		testCompile(project(":spring-context-support"))
-		testCompile(project(":spring-oxm"))
-		testCompile("com.thoughtworks.xstream:xstream:1.4.4")
-		testCompile("rome:rome:1.0")
-		testCompile("javax.activation:activation:1.1")
-		testCompile("javax.mail:mail:1.4.7")
-		testCompile("org.apache.tiles:tiles-request-api:1.0.1")
-		testCompile("org.apache.tiles:tiles-api:3.0.1")
-		testCompile("org.apache.tiles:tiles-core:3.0.1") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		testCompile("org.apache.tiles:tiles-servlet:3.0.1") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-	}
-}
-
 project("spring-aspects") {
 	description = "Spring Aspects"
 	apply from: "aspects.gradle"

settings.gradle

@@ -17,7 +17,6 @@ include "spring-orm"
 include "spring-orm-hibernate4"
 include "spring-oxm"
 include "spring-test"
-include "spring-test-mvc"
 include "spring-tx"
 include "spring-web"
 include "spring-webmvc"

spring-test-mvc/src/test/resources/log4j.properties

@@ -1,7 +0,0 @@
-log4j.rootCategory=WARN, stdout
-# log4j.logger.org.springframework.web=INFO
-# log4j.logger.org.springframework.test=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n