From b070cd360c34a3f24d10c19fc49d99701cdc81fc Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Sat, 1 Jul 2017 17:03:31 +0200 Subject: [PATCH 1/2] 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 --- acl/spring-security-acl.gradle | 1 - aspects/spring-security-aspects.gradle | 1 - config/spring-security-config.gradle | 1 - core/spring-security-core.gradle | 1 - docs/manual/src/docs/asciidoc/index.adoc | 4 ---- itest/context/spring-security-itest-context.gradle | 1 - messaging/spring-security-messaging.gradle | 1 - remoting/spring-security-remoting.gradle | 2 +- web/spring-security-web.gradle | 2 +- 9 files changed, 2 insertions(+), 12 deletions(-) diff --git a/acl/spring-security-acl.gradle b/acl/spring-security-acl.gradle index 31b5de0a573..53b4864c38e 100644 --- a/acl/spring-security-acl.gradle +++ b/acl/spring-security-acl.gradle @@ -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' diff --git a/aspects/spring-security-aspects.gradle b/aspects/spring-security-aspects.gradle index 564a3577a45..fbb81bb674f 100644 --- a/aspects/spring-security-aspects.gradle +++ b/aspects/spring-security-aspects.gradle @@ -7,6 +7,5 @@ dependencies { compile 'org.springframework:spring-context' compile 'org.springframework:spring-core' - testCompile 'aopalliance:aopalliance' testCompile 'org.springframework:spring-aop' } diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index d1336ed9576..4509a43bf9a 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -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' diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index faa9410ec52..ac13d0592c1 100644 --- a/core/spring-security-core.gradle +++ b/core/spring-security-core.gradle @@ -8,7 +8,6 @@ configurations { } dependencies { - compile 'aopalliance:aopalliance' compile 'org.springframework:spring-aop' compile 'org.springframework:spring-beans' compile 'org.springframework:spring-context' diff --git a/docs/manual/src/docs/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc index 4ec8c122677..bbc89f53375 100644 --- a/docs/manual/src/docs/asciidoc/index.adoc +++ b/docs/manual/src/docs/asciidoc/index.adoc @@ -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). diff --git a/itest/context/spring-security-itest-context.gradle b/itest/context/spring-security-itest-context.gradle index 3f54200b0a3..855cea3953e 100644 --- a/itest/context/spring-security-itest-context.gradle +++ b/itest/context/spring-security-itest-context.gradle @@ -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' diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle index 5ee9e2617ba..cd32b76a6b3 100644 --- a/messaging/spring-security-messaging.gradle +++ b/messaging/spring-security-messaging.gradle @@ -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' diff --git a/remoting/spring-security-remoting.gradle b/remoting/spring-security-remoting.gradle index ff6e06b7877..f3d8a34249e 100644 --- a/remoting/spring-security-remoting.gradle +++ b/remoting/spring-security-remoting.gradle @@ -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' diff --git a/web/spring-security-web.gradle b/web/spring-security-web.gradle index 7ee4bc59810..a09ba39922d 100644 --- a/web/spring-security-web.gradle +++ b/web/spring-security-web.gradle @@ -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' From 0f6d9cbe4daf9b1bca7e08d48e0b44df0a34e07e Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Tue, 19 Sep 2017 07:42:32 +0200 Subject: [PATCH 2/2] Also update the dependency management section The `aopalliance:aopalliance:1.0` dependency is indirectly pulled in by `spring-security-openid` through its dependence on `com.google.inject:guice:3.0`. There are no other references to ``aopalliance:aopalliance`. --- gradle/dependency-management.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 26826142f74..68d8e6c908c 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -34,7 +34,6 @@ dependencyManagement { dependencyManagement { dependencies { dependency 'antlr:antlr:2.7.7' - dependency 'aopalliance:aopalliance:1.0' dependency 'asm:asm:3.1' dependency 'bouncycastle:bcprov-jdk15:140' dependency 'ch.qos.logback:logback-classic:1.2.3'