mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-11-05 17:18:54 +00:00
9e719bc313
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
50 lines
1.4 KiB
Groovy
50 lines
1.4 KiB
Groovy
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
def includeProject = project(':spring-security-crypto')
|
|
|
|
configurations {
|
|
included
|
|
compile.extendsFrom included
|
|
}
|
|
|
|
dependencies {
|
|
compile 'org.springframework:spring-aop'
|
|
compile 'org.springframework:spring-beans'
|
|
compile 'org.springframework:spring-context'
|
|
compile 'org.springframework:spring-core'
|
|
compile 'org.springframework:spring-expression'
|
|
|
|
included includeProject
|
|
|
|
optional 'com.fasterxml.jackson.core:jackson-databind'
|
|
optional 'io.projectreactor:reactor-core'
|
|
optional 'javax.annotation:jsr250-api'
|
|
optional 'net.sf.ehcache:ehcache'
|
|
optional 'org.aspectj:aspectjrt'
|
|
optional 'org.springframework:spring-jdbc'
|
|
optional 'org.springframework:spring-tx'
|
|
|
|
testCompile powerMockDependencies
|
|
testCompile 'commons-collections:commons-collections'
|
|
testCompile 'io.projectreactor:reactor-test'
|
|
testCompile 'org.skyscreamer:jsonassert'
|
|
testCompile 'org.slf4j:jcl-over-slf4j'
|
|
testCompile 'org.springframework:spring-test'
|
|
|
|
testRuntime 'org.hsqldb:hsqldb'
|
|
}
|
|
|
|
classes.doLast {
|
|
copy {
|
|
from includeProject.sourceSets.main.output
|
|
into sourceSets.main.java.outputDir
|
|
}
|
|
}
|
|
|
|
tasks.sourcesJar.from {includeProject.sourceSets.main.java}
|
|
|
|
configure(project.tasks.withType(Test)) {
|
|
systemProperties['springSecurityVersion'] = version
|
|
systemProperties['springVersion'] = project.dependencyManagement.managedVersions['org.springframework:spring-core']
|
|
}
|