Skip to content

Commit dfa17bd

Browse files
author
Rob Winch
committed
SEC-2747: Remove spring-core dependency from spring-security-crypto
1 parent 30c5788 commit dfa17bd

File tree

15 files changed

+21
-18
lines changed

15 files changed

+21
-18
lines changed

‎acl/acl.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
dependencies {
44
compile project(':spring-security-core'),
5+
springCoreDependency,
56
'aopalliance:aopalliance:1.0',
67
"org.springframework:spring-aop:$springVersion",
78
"org.springframework:spring-context:$springVersion",

‎aspects/aspects.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
dependencies {
33
compile project(':spring-security-core'),
4+
springCoreDependency,
45
"org.springframework:spring-beans:$springVersion",
56
"org.springframework:spring-context:$springVersion"
67

‎cas/cas.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
dependencies {
33
compile project(':spring-security-core'),
44
project(':spring-security-web'),
5+
springCoreDependency,
56
"org.springframework:spring-context:$springVersion",
67
"org.springframework:spring-beans:$springVersion",
78
"org.springframework:spring-web:$springVersion",

‎config/config.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ compileTestJava.dependsOn(':spring-security-core:compileTestJava')
1010
dependencies {
1111
// NB: Don't add other compile time dependencies to the config module as this breaks tooling
1212
compile project(':spring-security-core'),
13+
springCoreDependency,
1314
'aopalliance:aopalliance:1.0',
1415
"org.springframework:spring-aop:$springVersion",
1516
"org.springframework:spring-context:$springVersion",

‎core/core.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ configurations {
1313
}
1414

1515
dependencies {
16-
compile 'aopalliance:aopalliance:1.0',
16+
compile springCoreDependency,
17+
'aopalliance:aopalliance:1.0',
1718
"org.springframework:spring-aop:$springVersion",
1819
"org.springframework:spring-beans:$springVersion",
1920
"org.springframework:spring-context:$springVersion",

‎crypto/pom.xml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,6 @@
4949
</repository>
5050
</repositories>
5151
<dependencies>
52-
<dependency>
53-
<groupId>org.springframework</groupId>
54-
<artifactId>spring-core</artifactId>
55-
<version>4.1.0.RC2</version>
56-
<scope>compile</scope>
57-
<exclusions>
58-
<exclusion>
59-
<artifactId>commons-logging</artifactId>
60-
<groupId>commons-logging</groupId>
61-
</exclusion>
62-
</exclusions>
63-
</dependency>
6452
<dependency>
6553
<groupId>commons-logging</groupId>
6654
<artifactId>commons-logging</artifactId>
@@ -101,7 +89,7 @@
10189
<dependency>
10290
<groupId>org.springframework</groupId>
10391
<artifactId>spring-test</artifactId>
104-
<version>4.1.0.RC2</version>
92+
<version>4.1.1.BUILD-SNAPSHOT</version>
10593
<scope>test</scope>
10694
</dependency>
10795
</dependencies>

‎data/data.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
dependencies {
22
compile project(':spring-security-core'),
3+
springCoreDependency,
34
"org.springframework.data:spring-data-commons:$springDataCommonsVersion"
45

56
}

‎gradle/javaprojects.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ ext.powerMockDependencies = [
5858
"org.powermock:powermock-reflect:$powerMockVersion"
5959
]
6060

61+
ext.springCoreDependency = [
62+
dependencies.create("org.springframework:spring-core:$springVersion") {
63+
exclude(group: 'commons-logging', module: 'commons-logging')
64+
}
65+
]
66+
6167
ext.jstlDependencies = [
6268
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
6369
"org.apache.taglibs:taglibs-standard-jstlel:1.2.1"
@@ -115,10 +121,6 @@ check.dependsOn integrationTest
115121
dependencies {
116122
optional 'commons-logging:commons-logging:1.1.1'
117123

118-
compile ("org.springframework:spring-core:$springVersion") {
119-
exclude(group: 'commons-logging', module: 'commons-logging')
120-
}
121-
122124
testCompile 'junit:junit:4.11',
123125
'org.mockito:mockito-core:1.9.5',
124126
"org.springframework:spring-test:$springVersion",

‎ldap/ldap.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
dependencies {
44
compile project(':spring-security-core'),
5+
springCoreDependency,
56
"org.springframework:spring-beans:$springVersion",
67
"org.springframework:spring-context:$springVersion",
78
"org.springframework:spring-tx:$springVersion"

‎messaging/messaging.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apply plugin: 'groovy'
22

33
dependencies {
44
compile project(':spring-security-core'),
5+
springCoreDependency,
56
'aopalliance:aopalliance:1.0',
67
"org.springframework:spring-beans:$springVersion",
78
"org.springframework:spring-context:$springVersion",

0 commit comments

Comments
 (0)