Skip to content

Commit 9e719bc

Browse files
Stephan202rwinch
authored andcommitted
Drop the aopalliance:aopalliance dependency
As of Spring 4.3 RC1 the `org.aopalliance` interfaces are once again bundled with `spring-aop` [1]. Moreover, all modules with a dependency on `aopalliance:aopalliance` directly or indirectly also depend on `spring-aop`. This change drops the `aopalliance:aopalliance` dependency in all places it's declared. Where applicable an explicit dependency on `spring-aop` was added in its place. (This dependency was already present in most places; in one case the module didn't require `aopalliance:aopalliance` in the first place.) The documentation is updated accordingly. [1] https://jira.spring.io/browse/SPR-13984
1 parent 192a177 commit 9e719bc

File tree

9 files changed

+2
-12
lines changed

9 files changed

+2
-12
lines changed

acl/spring-security-acl.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'io.spring.convention.spring-module'
22

33
dependencies {
44
compile project(':spring-security-core')
5-
compile 'aopalliance:aopalliance'
65
compile 'org.springframework:spring-aop'
76
compile 'org.springframework:spring-context'
87
compile 'org.springframework:spring-core'

aspects/spring-security-aspects.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ dependencies {
77
compile 'org.springframework:spring-context'
88
compile 'org.springframework:spring-core'
99

10-
testCompile 'aopalliance:aopalliance'
1110
testCompile 'org.springframework:spring-aop'
1211
}

config/spring-security-config.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ apply plugin: 'trang'
44
dependencies {
55
// NB: Don't add other compile time dependencies to the config module as this breaks tooling
66
compile project(':spring-security-core')
7-
compile 'aopalliance:aopalliance:1.0'
87
compile 'org.springframework:spring-aop'
98
compile 'org.springframework:spring-beans'
109
compile 'org.springframework:spring-context'

core/spring-security-core.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ configurations {
88
}
99

1010
dependencies {
11-
compile 'aopalliance:aopalliance'
1211
compile 'org.springframework:spring-aop'
1312
compile 'org.springframework:spring-beans'
1413
compile 'org.springframework:spring-context'

docs/manual/src/docs/asciidoc/index.adoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9858,10 +9858,6 @@ The core module must be included in any project using Spring Security.
98589858
|===
98599859
| Dependency | Version | Description
98609860

9861-
| aopalliance
9862-
| 1.0
9863-
| Required for method security implementation.
9864-
98659861
| ehcache
98669862
| 1.6.2
98679863
| Required if the Ehcache-based user cache implementation is used (optional).

itest/context/spring-security-itest-context.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'io.spring.convention.spring-test'
22

33
dependencies {
44
compile project(':spring-security-core')
5-
compile 'aopalliance:aopalliance'
65
compile 'org.python:jython'
76
compile 'org.springframework:spring-aop'
87
compile 'org.springframework:spring-beans'

messaging/spring-security-messaging.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'io.spring.convention.spring-module'
22

33
dependencies {
44
compile project(':spring-security-core')
5-
compile 'aopalliance:aopalliance'
65
compile 'org.springframework:spring-beans'
76
compile 'org.springframework:spring-context'
87
compile 'org.springframework:spring-core'

remoting/spring-security-remoting.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'io.spring.convention.spring-module'
22

33
dependencies {
44
compile project(':spring-security-core')
5-
compile 'aopalliance:aopalliance'
5+
compile 'org.springframework:spring-aop'
66
compile 'org.springframework:spring-beans'
77
compile 'org.springframework:spring-context'
88
compile 'org.springframework:spring-core'

web/spring-security-web.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'io.spring.convention.spring-module'
33
dependencies {
44
compile project(':spring-security-core')
55
compile springCoreDependency
6-
compile 'aopalliance:aopalliance'
6+
compile 'org.springframework:spring-aop'
77
compile 'org.springframework:spring-beans'
88
compile 'org.springframework:spring-context'
99
compile 'org.springframework:spring-expression'

0 commit comments

Comments
 (0)