SEC-2542: Polish dependency exclusions

This cleans up exclusions so the pom.xml are not as cluttered.

taglibs/pom.xml

@@ -182,6 +182,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>

taglibs/taglibs.gradle

@@ -14,11 +14,8 @@ dependencies {
     provided 'javax.servlet.jsp:javax.servlet.jsp-api:2.2.1',
              "javax.servlet:javax.servlet-api:$servletApiVersion"
 
-    testCompile "org.codehaus.groovy:groovy-all:$groovyVersion"
-
-    testCompile("org.spockframework:spock-core:$spockVersion") {
-        exclude group:'junit', module:'junit-dep'
-    }
+    testCompile "org.codehaus.groovy:groovy-all:$groovyVersion",
+                spockDependencies
 
     testRuntime "javax.servlet:jstl:$jstlVersion"
 }