Merge branch 'SPR-10126' into cleanup-3.2.x

* SPR-10126: Replace EasyMock with Mockito in spring-orm
dharkness · Jan 10, 2013 · 1386479 · 1386479
2 parents f92f58d + ee1ddc9
commit 1386479
Show file tree

Hide file tree

Showing 30 changed files with 3,096 additions and 6,715 deletions.
diff --git a/build.gradle b/build.gradle
@@ -71,7 +71,7 @@ configure(allprojects) { project ->
 		testCompile("junit:junit:${junitVersion}")
 		testCompile("org.hamcrest:hamcrest-all:1.3")
 		testCompile("org.mockito:mockito-core:1.9.5")
-		if (project.name in ["spring", "spring-jms", "spring-orm",
+		if (project.name in ["spring", "spring-jms",
 				"spring-orm-hibernate4", "spring-oxm", "spring-struts",
 				"spring-test", "spring-test-mvc", "spring-tx", "spring-web",
 				"spring-webmvc", "spring-webmvc-portlet", "spring-webmvc-tiles3"]) {