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
This commit is contained in:
parent
192a177ddf
commit
9e719bc313
|
@ -2,7 +2,6 @@ apply plugin: 'io.spring.convention.spring-module'
|
|||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile 'aopalliance:aopalliance'
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-core'
|
||||
|
|
|
@ -7,6 +7,5 @@ dependencies {
|
|||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-core'
|
||||
|
||||
testCompile 'aopalliance:aopalliance'
|
||||
testCompile 'org.springframework:spring-aop'
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@ apply plugin: 'trang'
|
|||
dependencies {
|
||||
// NB: Don't add other compile time dependencies to the config module as this breaks tooling
|
||||
compile project(':spring-security-core')
|
||||
compile 'aopalliance:aopalliance:1.0'
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
|
|
|
@ -8,7 +8,6 @@ configurations {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile 'aopalliance:aopalliance'
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
|
|
|
@ -9858,10 +9858,6 @@ The core module must be included in any project using Spring Security.
|
|||
|===
|
||||
| Dependency | Version | Description
|
||||
|
||||
| aopalliance
|
||||
| 1.0
|
||||
| Required for method security implementation.
|
||||
|
||||
| ehcache
|
||||
| 1.6.2
|
||||
| Required if the Ehcache-based user cache implementation is used (optional).
|
||||
|
|
|
@ -2,7 +2,6 @@ apply plugin: 'io.spring.convention.spring-test'
|
|||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile 'aopalliance:aopalliance'
|
||||
compile 'org.python:jython'
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-beans'
|
||||
|
|
|
@ -2,7 +2,6 @@ apply plugin: 'io.spring.convention.spring-module'
|
|||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile 'aopalliance:aopalliance'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-core'
|
||||
|
|
|
@ -2,7 +2,7 @@ apply plugin: 'io.spring.convention.spring-module'
|
|||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile 'aopalliance:aopalliance'
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-core'
|
||||
|
|
|
@ -3,7 +3,7 @@ apply plugin: 'io.spring.convention.spring-module'
|
|||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile springCoreDependency
|
||||
compile 'aopalliance:aopalliance'
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-expression'
|
||||
|
|
Loading…
Reference in New Issue