SEC-2207: Update Gradle to 1.6

config/config.gradle

@@ -5,12 +5,6 @@ apply plugin: 'trang'
 
 compileTestJava.dependsOn(':spring-security-core:compileTestJava')
 
-configurations {
-    // GRADLE-1124
-    compile.extendsFrom = []
-    testCompile.extendsFrom groovy
-}
-
 dependencies {
     // NB: Don't add other compile time dependencies to the config module as this breaks tooling
     compile project(':spring-security-core'),
@@ -34,8 +28,6 @@ dependencies {
 
     provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion"
 
-    groovy 'org.codehaus.groovy:groovy:1.8.7'
-
     testCompile project(':spring-security-ldap'),
                 project(':spring-security-openid'),
                 project(':spring-security-cas'),
@@ -50,7 +42,8 @@ dependencies {
                 "org.slf4j:jcl-over-slf4j:$slf4jVersion",
                 "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final",
                 "org.hibernate:hibernate-entitymanager:4.1.0.Final",
-                powerMockDependencies
+                powerMockDependencies,
+                'org.codehaus.groovy:groovy:1.8.7'
     testCompile('org.openid4java:openid4java-nodeps:0.9.6') {
        exclude group: 'com.google.code.guice', module: 'guice'
     }

config/template.mf

@@ -9,16 +9,21 @@ Ignored-Existing-Headers:
  Import-Package,
  Export-Package
 Import-Template:
+ org.aopalliance.*;version="${aopAllianceRange}",
  org.apache.commons.logging.*;version="${cloggingRange}",
  org.aopalliance.*;version="${aopAllianceRange}";resolution:=optional,
  org.aspectj.*;version="${aspectjRange}";resolution:=optional,
+ org.openid4java.*;version="${openid4javaRange}",
  org.springframework.security.access.*;version="${secRange}",
  org.springframework.security.authentication.*;version="${secRange}",
  org.springframework.security.core.*;version="${secRange}",
  org.springframework.security.crypto.bcrypt.*;version="${secRange}",
  org.springframework.security.crypto.password.*;version="${secRange}",
+ org.springframework.security.crypto.*;version="${secRange}",
  org.springframework.security.util;version="${secRange}",
  org.springframework.security.provisioning;version="${secRange}",
+ org.springframework.security.ldap.*;version="${secRange}",
+ org.springframework.security.openid.*;version="${secRange}";resolution:=optional,
  org.springframework.security.web.*;version="${secRange}";resolution:=optional,
  org.springframework.security.ldap.*;version="${secRange}";resolution:=optional,
  org.springframework.security.openid.*;version="${secRange}";resolution:=optional,
@@ -29,9 +34,13 @@ Import-Template:
  org.springframework.beans.*;version="${springRange}",
  org.springframework.context.*;version="${springRange}",
  org.springframework.core.*;version="${springRange}",
+ org.springframework.http.*;version="${springRange}",
+ org.springframework.ldap.*;version="${springLdapRange}",
+ org.springframework.jdbc.*;version="${springRange}",
  org.springframework.web.*;version="${springRange}",
  org.springframework.util.*;version="${springRange}",
  javax.servlet.*;version="0";resolution:=optional,
  org.openid4java.*;version="${openid4javaRange}",
+ javax.sql.*;version="0";resolution:=optional,
  javax.naming.directory;version="0";resolution:=optional,
  org.w3c.dom;version="0";resolution:=optional