Skip to content

Commit 0e3a1d8

Browse files
committed
Require aopalliance dependency for spring-aop
A recent commit made aopalliance optional for spring-aop, while continuing to require it for spring-tx. On review, this is probably overly aggressive, and for convenience aopalliance should remain required for spring-aop. There are use cases for which aopalliance is indeed optional, but core functionality such as <aop:scoped-proxy> should never result in a ClassNotFoundException. This commit returns the aopalliance dependency for spring-aop to required status, and also explicitly notes the same dependency in other modules that compile directly against aopalliance types. Issue: SPR-9501
1 parent 49fd203 commit 0e3a1d8

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ project('spring-aop') {
168168
dependencies {
169169
compile project(":spring-core")
170170
compile project(":spring-beans")
171+
compile("aopalliance:aopalliance:1.0")
171172
compile("com.jamonapi:jamon:2.4", optional)
172-
compile("aopalliance:aopalliance:1.0", optional)
173173
compile("commons-pool:commons-pool:1.5.3", optional)
174174
}
175175
}
@@ -248,9 +248,9 @@ project('spring-tx') {
248248
compile(project(":spring-aop"), optional)
249249
compile project(":spring-beans")
250250
compile project(":spring-core")
251+
compile("aopalliance:aopalliance:1.0")
251252
compile("com.ibm.websphere:uow:6.0.2.17", provided)
252253
compile("javax.resource:connector-api:1.5", optional)
253-
compile "aopalliance:aopalliance:1.0" // NOT optional, as opposed to in :spring-aop
254254
compile("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1", optional)
255255
testCompile "org.easymock:easymockclassextension:2.3"
256256
}
@@ -287,6 +287,7 @@ project('spring-jms') {
287287
compile project(":spring-context")
288288
compile project(":spring-tx")
289289
compile(project(":spring-oxm"), optional)
290+
compile("aopalliance:aopalliance:1.0")
290291
compile("org.codehaus.jackson:jackson-mapper-asl:1.4.2", optional)
291292
}
292293
}
@@ -346,6 +347,7 @@ project('spring-web') {
346347
compile project(":spring-aop") // for JaxWsPortProxyFactoryBean
347348
compile project(":spring-context")
348349
compile(project(":spring-oxm"), optional) // for MarshallingHttpMessageConverter
350+
compile("aopalliance:aopalliance:1.0")
349351
compile("com.caucho:hessian:3.2.1", optional)
350352
compile("rome:rome:1.0", optional)
351353
compile("javax.el:el-api:1.0", optional)
@@ -378,6 +380,7 @@ project('spring-orm') {
378380
dependencies {
379381
// compiling against both hibernate 3 and 4 here in order to support
380382
// our respective orm.hibernate3 and orm.hibernate4 packages
383+
compile("aopalliance:aopalliance:1.0")
381384
compile("org.hibernate:com.springsource.org.hibernate:3.3.1.GA", optional)
382385
compile("org.hibernate:hibernate-core:4.1.0.Final", optional)
383386
compile("org.hibernate:hibernate-cglib-repack:2.1_3", optional)

0 commit comments

Comments
 (0)