From a2d80c6094f17a918c63122e01a5350166b272bc Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 3 Jan 2013 12:12:08 +0100
Subject: [PATCH] Polish build.gradle

 - Consolidate shared test systemProperty declarations
 - Consolidate easymock dependency declarations
---
 build.gradle | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 071fdc3d61..2e2daffb0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 	}
 }
 
-configure(allprojects) {
+configure(allprojects) { project ->
 	ext.aspectjVersion  = "1.7.1"
 	ext.easymockVersion = "2.5.2"
 	ext.hsqldbVersion   = "1.8.0.10"
@@ -65,7 +65,10 @@ configure(allprojects) {
 
 	sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
 
-	test.systemProperty("java.awt.headless", "true")
+	test {
+		systemProperty("java.awt.headless", "true")
+		systemProperty("testGroups", properties.get("testGroups"))
+	}
 
 	repositories {
 		maven { url "http://repo.springsource.org/libs-release" }
@@ -76,6 +79,13 @@ configure(allprojects) {
 		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",
+				"spring-orm-hibernate4", "spring-oxm", "spring-struts",
+				"spring-test", "spring-test-mvc", "spring-tx", "spring-web",
+				"spring-webmvc", "spring-webmvc-portlet", "spring-webmvc-tiles3"]) {
+			testCompile("org.easymock:easymock:${easymockVersion}")
+			testCompile "org.easymock:easymockclassextension:${easymockVersion}"
+		}
 	}
 
 	ext.javadocLinks = [
@@ -101,16 +111,6 @@ configure(allprojects) {
 	] as String[]
 }
 
-configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
-		"spring-orm-hibernate4", "spring-oxm", "spring-struts", "spring-test",
-		"spring-test-mvc", "spring-tx", "spring-web", "spring-webmvc",
-		"spring-webmvc-portlet", "spring-webmvc-tiles3"]}) {
-	dependencies {
-		testCompile("org.easymock:easymock:${easymockVersion}")
-		testCompile "org.easymock:easymockclassextension:${easymockVersion}"
-	}
-}
-
 configure(subprojects - project(":spring-build-src")) { subproject ->
 	apply plugin: "merge"
 	apply from: "${gradleScriptDir}/publish-maven.gradle"
@@ -160,14 +160,6 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 	}
 }
 
-configure(allprojects) {
-	dependencies {
-		testCompile("junit:junit:${junitVersion}")
-		testCompile("org.hamcrest:hamcrest-all:1.3")
-	}
-	test.systemProperties.put("testGroups", properties.get("testGroups"))
-}
-
 project("spring-build-src") {
 	description = "Exposes gradle buildSrc for IDE support"
 	apply plugin: "groovy"