Some adjustments to the core build to make sure crypto classes are correctly exported to other tasks.

This commit is contained in:
Luke Taylor 2011-03-08 16:19:51 +00:00
parent 57c3afd31a
commit 885f0270dc

View File

@ -1,10 +1,11 @@
// Core build file // Core build file
// We don't define a module dependency on crypto to avoid creating a transitive dependency
def cryptoProject = project(':spring-security-crypto') def cryptoProject = project(':spring-security-crypto')
def cryptoClasses = cryptoProject.sourceSets.main.classes
dependencies { dependencies {
compile cryptoProject, compile 'aopalliance:aopalliance:1.0',
'aopalliance:aopalliance:1.0',
"net.sf.ehcache:ehcache:$ehcacheVersion", "net.sf.ehcache:ehcache:$ehcacheVersion",
"org.springframework:spring-aop:$springVersion", "org.springframework:spring-aop:$springVersion",
"org.springframework:spring-beans:$springVersion", "org.springframework:spring-beans:$springVersion",
@ -23,10 +24,17 @@ dependencies {
testRuntime "hsqldb:hsqldb:$hsqlVersion" testRuntime "hsqldb:hsqldb:$hsqlVersion"
} }
// Add the crypto module classes compileJava.dependsOn cryptoProject.compileJava
classes.dependsOn cryptoProject.classes
jar { classes.doLast {
from cryptoProject.sourceSets.main.classes copy {
from cryptoClasses
into sourceSets.main.classesDir
}
} }
bundlor.inputPath(cryptoProject.sourceSets.main.classes) sourceSets.main.compileClasspath += cryptoClasses
sourceSets.test.compileClasspath += cryptoClasses
sourceJar.from cryptoProject.sourceSets.main.java