Standardize Build

The build now uses spring build conventions to simplify the build

Fixes gh-4284

itest/context/itest-context.gradle

@@ -1,17 +0,0 @@
-System.setProperty('python.cachedir.skip', 'true')
-
-dependencies {
-	compile		project(':spring-security-core'),
-				'aopalliance:aopalliance:1.0',
-				'org.python:jython:2.5.0',
-				"org.springframework:spring-context:$springVersion",
-				"org.springframework:spring-aop:$springVersion",
-				"org.springframework:spring-tx:$springVersion",
-				"org.springframework:spring-beans:$springVersion"
-
-	testCompile project(':spring-security-web'),
-				"javax.servlet:javax.servlet-api:$servletApiVersion",
-				"org.springframework:spring-web:$springVersion"
-	testRuntime project(':spring-security-config'),
-				"org.aspectj:aspectjweaver:$aspectjVersion"
-}

itest/context/spring-security-itest-context.gradle

@@ -0,0 +1,20 @@
+apply plugin: 'io.spring.convention.spring-test'
+
+dependencies {
+	compile project(':spring-security-core')
+	compile 'aopalliance:aopalliance'
+	compile 'org.python:jython'
+	compile 'org.springframework:spring-aop'
+	compile 'org.springframework:spring-beans'
+	compile 'org.springframework:spring-context'
+	compile 'org.springframework:spring-tx'
+
+	testCompile project(':spring-security-web')
+	testCompile 'javax.servlet:javax.servlet-api'
+	testCompile 'org.springframework:spring-web'
+
+	testRuntime project(':spring-security-config')
+	testRuntime 'org.aspectj:aspectjweaver'
+}
+
+System.setProperty('python.cachedir.skip', 'true')

itest/web/itest-web.gradle

@@ -1,24 +0,0 @@
-
-dependencies {
-	compile		"org.springframework:spring-context:$springVersion",
-				"org.springframework:spring-web:$springVersion"
-
-	provided "javax.servlet:javax.servlet-api:$servletApiVersion"
-
-	testCompile project(':spring-security-core'),
-				project(':spring-security-web'),
-				project(':spring-security-test'),
-				"org.springframework:spring-beans:$springVersion",
-				"org.springframework:spring-webmvc:$springVersion",
-				"org.springframework:spring-test:$springVersion"
-
-	testRuntime project(':spring-security-config'),
-				project(':spring-security-ldap')
-}
-
-integrationTest {
-	options {
-		jvmArgs = ["-ea", '-Xms128m', '-Xmx500m']
-	}
-	maxParallelForks = 1
-}

itest/web/spring-security-itest-web.gradle

@@ -0,0 +1,25 @@
+apply plugin: 'io.spring.convention.spring-test'
+
+dependencies {
+	compile 'org.springframework:spring-context'
+	compile 'org.springframework:spring-web'
+
+	provided 'javax.servlet:javax.servlet-api'
+
+	testCompile project(':spring-security-core')
+	testCompile project(':spring-security-test')
+	testCompile project(':spring-security-web')
+	testCompile 'org.springframework:spring-beans'
+	testCompile 'org.springframework:spring-test'
+	testCompile 'org.springframework:spring-webmvc'
+
+	testRuntime project(':spring-security-config')
+	testRuntime project(':spring-security-ldap')
+}
+
+integrationTest {
+	options {
+		jvmArgs = ['-ea', '-Xms128m', '-Xmx500m']
+	}
+	maxParallelForks = 1
+}