From dfa17bdb980e2d15e6ffc33e5eb73e2f91b2573d Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 20 Nov 2014 16:16:22 -0600 Subject: [PATCH] SEC-2747: Remove spring-core dependency from spring-security-crypto --- acl/acl.gradle | 1 + aspects/aspects.gradle | 1 + cas/cas.gradle | 1 + config/config.gradle | 1 + core/core.gradle | 3 ++- crypto/pom.xml | 14 +------------- data/data.gradle | 1 + gradle/javaprojects.gradle | 10 ++++++---- ldap/ldap.gradle | 1 + messaging/messaging.gradle | 1 + openid/openid.gradle | 1 + remoting/remoting.gradle | 1 + taglibs/taglibs.gradle | 1 + test/test.gradle | 1 + web/web.gradle | 1 + 15 files changed, 21 insertions(+), 18 deletions(-) diff --git a/acl/acl.gradle b/acl/acl.gradle index 016eed6fcc..084fe4895e 100644 --- a/acl/acl.gradle +++ b/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", diff --git a/aspects/aspects.gradle b/aspects/aspects.gradle index 0cd30dcc24..865d2415ef 100644 --- a/aspects/aspects.gradle +++ b/aspects/aspects.gradle @@ -1,6 +1,7 @@ dependencies { compile project(':spring-security-core'), + springCoreDependency, "org.springframework:spring-beans:$springVersion", "org.springframework:spring-context:$springVersion" diff --git a/cas/cas.gradle b/cas/cas.gradle index efed5f4fb9..1050de61bf 100644 --- a/cas/cas.gradle +++ b/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", diff --git a/config/config.gradle b/config/config.gradle index 240bc642cc..17fd5c1a4f 100644 --- a/config/config.gradle +++ b/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", diff --git a/core/core.gradle b/core/core.gradle index 9c28fce7bb..37aea84f98 100644 --- a/core/core.gradle +++ b/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", diff --git a/crypto/pom.xml b/crypto/pom.xml index 845b349b22..56df77e4c3 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -49,18 +49,6 @@ - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -101,7 +89,7 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test diff --git a/data/data.gradle b/data/data.gradle index 0d27da17e3..cc96350d29 100644 --- a/data/data.gradle +++ b/data/data.gradle @@ -1,5 +1,6 @@ dependencies { compile project(':spring-security-core'), + springCoreDependency, "org.springframework.data:spring-data-commons:$springDataCommonsVersion" } \ No newline at end of file diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 7b60c9ac69..f7ea43ddf1 100644 --- a/gradle/javaprojects.gradle +++ b/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", diff --git a/ldap/ldap.gradle b/ldap/ldap.gradle index eb6fda883a..403e03b25f 100644 --- a/ldap/ldap.gradle +++ b/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" diff --git a/messaging/messaging.gradle b/messaging/messaging.gradle index 768a4c6b2d..66a6b405d6 100644 --- a/messaging/messaging.gradle +++ b/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", diff --git a/openid/openid.gradle b/openid/openid.gradle index 59185c3953..64e51e9a4b 100644 --- a/openid/openid.gradle +++ b/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", diff --git a/remoting/remoting.gradle b/remoting/remoting.gradle index 2530862965..63e12dfd89 100644 --- a/remoting/remoting.gradle +++ b/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" diff --git a/taglibs/taglibs.gradle b/taglibs/taglibs.gradle index d407de54ed..0909732bbc 100644 --- a/taglibs/taglibs.gradle +++ b/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", diff --git a/test/test.gradle b/test/test.gradle index 894f4644e6..b3406e3c90 100644 --- a/test/test.gradle +++ b/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') diff --git a/web/web.gradle b/web/web.gradle index f9bc35a163..666dc6fae4 100644 --- a/web/web.gradle +++ b/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",