SEC-2747: Remove spring-core dependency from spring-security-crypto

acl/acl.gradle

@@ -2,6 +2,7 @@
 
 dependencies {
     compile project(':spring-security-core'),
+            springCoreDependency,
             'aopalliance:aopalliance:1.0',
             "org.springframework:spring-aop:$springVersion",
             "org.springframework:spring-context:$springVersion",

aspects/aspects.gradle

@@ -1,6 +1,7 @@
 
 dependencies {
     compile project(':spring-security-core'),
+            springCoreDependency,
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-context:$springVersion"
 

cas/cas.gradle

@@ -2,6 +2,7 @@
 dependencies {
     compile project(':spring-security-core'),
             project(':spring-security-web'),
+            springCoreDependency,
             "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-web:$springVersion",

config/config.gradle

@@ -10,6 +10,7 @@ compileTestJava.dependsOn(':spring-security-core:compileTestJava')
 dependencies {
     // NB: Don't add other compile time dependencies to the config module as this breaks tooling
     compile project(':spring-security-core'),
+            springCoreDependency,
             'aopalliance:aopalliance:1.0',
             "org.springframework:spring-aop:$springVersion",
             "org.springframework:spring-context:$springVersion",

core/core.gradle

@@ -13,7 +13,8 @@ configurations {
 }
 
 dependencies {
-    compile 'aopalliance:aopalliance:1.0',
+    compile springCoreDependency,
+            'aopalliance:aopalliance:1.0',
             "org.springframework:spring-aop:$springVersion",
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-context:$springVersion",

crypto/pom.xml

@@ -49,18 +49,6 @@
     </repository>
   </repositories>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>4.1.0.RC2</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -101,7 +89,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>4.1.0.RC2</version>
+      <version>4.1.1.BUILD-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

data/data.gradle

@@ -1,5 +1,6 @@
 dependencies {
     compile project(':spring-security-core'),
+            springCoreDependency,
             "org.springframework.data:spring-data-commons:$springDataCommonsVersion"
 
 }

gradle/javaprojects.gradle

@@ -58,6 +58,12 @@ ext.powerMockDependencies = [
     "org.powermock:powermock-reflect:$powerMockVersion"
 ]
 
+ext.springCoreDependency = [
+    dependencies.create("org.springframework:spring-core:$springVersion") {
+        exclude(group: 'commons-logging', module: 'commons-logging')
+    }
+]
+
 ext.jstlDependencies = [
         "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
         "org.apache.taglibs:taglibs-standard-jstlel:1.2.1"
@@ -115,10 +121,6 @@ check.dependsOn integrationTest
 dependencies {
     optional 'commons-logging:commons-logging:1.1.1'
 
-    compile ("org.springframework:spring-core:$springVersion") {
-        exclude(group: 'commons-logging', module: 'commons-logging')
-    }
-
     testCompile 'junit:junit:4.11',
             'org.mockito:mockito-core:1.9.5',
             "org.springframework:spring-test:$springVersion",

ldap/ldap.gradle

@@ -2,6 +2,7 @@
 
 dependencies {
     compile project(':spring-security-core'),
+            springCoreDependency,
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-tx:$springVersion"

messaging/messaging.gradle

@@ -2,6 +2,7 @@ apply plugin: 'groovy'
 
 dependencies {
     compile project(':spring-security-core'),
+            springCoreDependency,
             'aopalliance:aopalliance:1.0',
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-context:$springVersion",

openid/openid.gradle

@@ -3,6 +3,7 @@
 dependencies {
     compile project(':spring-security-core'),
             project(':spring-security-web'),
+            springCoreDependency,
             "org.springframework:spring-aop:$springVersion",
             "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-beans:$springVersion",

remoting/remoting.gradle

@@ -3,6 +3,7 @@
 dependencies {
     compile project(':spring-security-core'),
             'aopalliance:aopalliance:1.0',
+            springCoreDependency,
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-web:$springVersion"

taglibs/taglibs.gradle

@@ -5,6 +5,7 @@ dependencies {
     compile project(':spring-security-core'),
             project(':spring-security-web'),
             project(':spring-security-acl'),
+            springCoreDependency,
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-aop:$springVersion",
             "org.springframework:spring-context:$springVersion",

test/test.gradle

@@ -3,6 +3,7 @@
 dependencies {
     compile project(':spring-security-core'),
             project(':spring-security-web'),
+            springCoreDependency,
             "org.springframework:spring-test:$springVersion"
 
     optional project(':spring-security-config')

web/web.gradle

@@ -2,6 +2,7 @@ apply plugin: 'groovy'
 
 dependencies {
     compile project(':spring-security-core'),
+            springCoreDependency,
             'aopalliance:aopalliance:1.0',
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-context:$springVersion",