Skip to content

Commit

Permalink
move dependencies to parent build
Browse files Browse the repository at this point in the history
  • Loading branch information
SavvasMisaghMoayyed committed Jan 10, 2016
1 parent 83f5ade commit ac4935a
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 146 deletions.
83 changes: 69 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,28 @@ ext.libraries = [
grouper : "edu.internet2.middleware.grouper:grouperClient:$grouperVersion",
guava : [
"com.google.guava:guava:$guavaVersion",
"org.reflections:reflections:$reflectionsVersion",
dependencies.create("org.reflections:reflections:$reflectionsVersion") {
exclude(module: 'guava')
force = true
},
"javassist:javassist:$javassistVersion"
],
hazelcast : "com.hazelcast:hazelcast:$hazelcastVersion",
hibernate : [
"org.hibernate:hibernate-core:$hibernateVersion",
"org.hibernate:hibernate-entitymanager:$hibernateVersion",
"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
dependencies.create("org.hibernate:hibernate-core:$hibernateVersion") {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
force = true
},
dependencies.create("org.hibernate:hibernate-entitymanager:$hibernateVersion") {
exclude(module: 'javassist')
force = true
},
dependencies.create("org.hibernate:hibernate-validator:$hibernateValidatorVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
force = true
},
"com.mchange:c3p0:$c3p0Version"
],
httpclient : "org.apache.httpcomponents:httpclient:$httpclientVersion",
Expand Down Expand Up @@ -77,8 +91,23 @@ ext.libraries = [
exclude(module: 'slf4j-api')
force = true
},
"org.jasig.inspektr:inspektr-audit:$inspektrVersion",
"org.jasig.inspektr:inspektr-support-spring:$inspektrVersion",
dependencies.create("org.jasig.inspektr:inspektr-audit:$inspektrVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'aspectjrt')
force = true
},
dependencies.create("org.jasig.inspektr:inspektr-support-spring:$inspektrVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'spring-web')
exclude(module: 'spring-webmvc')
exclude(module: 'spring-tx')
exclude(module: 'spring-beans')
exclude(module: 'spring-jdbc')
exclude(module: 'aspectjrt')
exclude(module: 'validation-api')
}
],
javax : [
"javax.el:javax.el-api:$javaxElVersion",
Expand Down Expand Up @@ -109,7 +138,14 @@ ext.libraries = [
force = true
},
"junit:junit:$junitVersion",
"com.unboundid:unboundid-ldapsdk:$unboundidVersion",
dependencies.create("com.unboundid:unboundid-ldapsdk:$unboundidVersion") {
exclude(module: 'slf4j-api')
force = true
},
dependencies.create("org.ldaptive:ldaptive-unboundid:$ldaptiveVersion") {
exclude(module: 'slf4j-api')
force = true
}
"com.github.fakemongo:fongo:$fongoVersion",
"de.flapdoodle.embed:de.flapdoodle.embed.memcached:$memcachedEmbeddedVersion",
"org.hsqldb:hsqldb:$hsqlVersion",
Expand All @@ -125,7 +161,6 @@ ext.libraries = [
ldaptive : [
"org.ldaptive:ldaptive:$ldaptiveVersion",
"org.ldaptive:ldaptive-beans:$ldaptiveVersion",
"org.ldaptive:ldaptive-unboundid:$ldaptiveVersion",
],
log4j : [
"org.apache.logging.log4j:log4j-api:$log4jVersion",
Expand Down Expand Up @@ -172,7 +207,10 @@ ext.libraries = [
"org.pac4j:pac4j-config:$pac4jVersion",
"org.pac4j:pac4j-core:$pac4jVersion",
"org.pac4j:pac4j-http:$pac4jVersion",
"org.pac4j:pac4j-jwt:$pac4jVersion",
dependencies.create("org.pac4j:pac4j-jwt:$pac4jVersion") {
exclude(module: 'slf4j-api')
force = true
},
"org.pac4j:pac4j-mongo:$pac4jVersion",
"org.pac4j:pac4j-oauth:$pac4jVersion",
"org.pac4j:pac4j-saml:$pac4jVersion",
Expand All @@ -181,12 +219,25 @@ ext.libraries = [

],
persondirectory : "org.jasig.service.persondir:person-directory-impl:$personDirectoryVersion",
quartz : "org.quartz-scheduler:quartz:$quartzVersion",
quartz : dependencies.create("org.quartz-scheduler:quartz:$quartzVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'c3p0')
force = true
},
shiro : "org.apache.shiro:shiro-core:$shiroVersion",
spring : [
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework.webflow:spring-binding:$springWebflowVersion",
dependencies.create("org.springframework.webflow:spring-binding:$springWebflowVersion") {
exclude(module: 'commons-logging')
exclude(module: 'spring-context')
exclude(module: 'spring-web')
exclude(module: 'spring-beans')
exclude(module: 'spring-core')
exclude(module: 'spring-expression')
exclude(module: 'spring-webmvc')
force = true
},
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-context-support:$springVersion",
dependencies.create("org.springframework:spring-core:$springVersion") {
Expand All @@ -210,12 +261,16 @@ ext.libraries = [
exclude(module: 'spring-beans')
exclude(module: 'bcprov-jdk15on')
force = true
},
},
"org.springframework:spring-webmvc:$springVersion"
],
validationapi : "javax.validation:validation-api:$javaxValidationVersion",
xmlapis : "xml-apis:xml-apis:$xmlapisVersion",
yubicoapi : "com.yubico:yubico-validation-client2:$yubicoVersion"
yubicoapi : dependencies.create("com.yubico:yubico-validation-client2:$yubicoVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'commons-codec')
force = true
}
]


Expand Down Expand Up @@ -563,4 +618,4 @@ task javadoc(type: Javadoc) {
source subprojects.collect { project -> project.sourceSets.main.allJava }
destinationDir = new File(buildDir, 'javadoc')
classpath = files(subprojects.collect { project -> project.sourceSets.main.compileClasspath })
}
}
34 changes: 6 additions & 28 deletions cas-server-support-spnego/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,13 @@ dependencies {
compile project(':cas-server-core-web')
compile project(':cas-server-core-authentication')
compile project(':cas-server-core-util')
compile(group: 'org.ldaptive', name: 'ldaptive', version: ldaptiveVersion) {
exclude(module: 'slf4j-api')
}
compile group: 'jcifs', name: 'jcifs', version: jcifsVersion
compile group: 'org.samba.jcifs', name: 'jcifs-ext', version: jcifsExtVersion
compile(group: 'org.springframework.webflow', name: 'spring-webflow', version: springWebflowVersion) {
exclude(module: 'commons-logging')
exclude(module: 'spring-context')
exclude(module: 'spring-web')
exclude(module: 'spring-beans')
exclude(module: 'spring-core')
exclude(module: 'spring-expression')
exclude(module: 'spring-webmvc')
}
runtime(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
compile libraries.ldaptive
compile libraries.jcifs
compile libraries.spring
runtime libraries.hibernate

testCompile project(path: ":cas-server-support-ldap", configuration: "tests")
testCompile project(':cas-server-core')
testCompile project(':cas-server-core-logout')
testCompile(group: 'com.unboundid', name: 'unboundid-ldapsdk', version: unboundidVersion) {
exclude(module: 'slf4j-api')
}
testCompile(group: 'org.ldaptive', name: 'ldaptive-unboundid', version: ldaptiveVersion) {
exclude(module: 'slf4j-api')
}
testCompile(group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
}
testCompile libraries.tests
}
25 changes: 4 additions & 21 deletions cas-server-support-token/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,10 @@ dependencies {
compile project(':cas-server-core-authentication')
compile project(':cas-server-core-services')
compile project(':cas-server-integration-pac4j')
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:jacksonDatabindVersion
compile(group: 'org.pac4j', name: 'pac4j-jwt', version: pac4jVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'org.springframework', name: 'spring-core', version: springVersion) {
exclude(module: 'commons-logging')
}
compile(group: 'org.springframework.webflow', name: 'spring-webflow', version:springWebflowVersion) {
exclude(module: 'commons-logging')
exclude(module: 'spring-context')
exclude(module: 'spring-web')
exclude(module: 'spring-beans')
exclude(module: 'spring-core')
exclude(module: 'spring-expression')
exclude(module: 'spring-webmvc')
}
compile group: 'org.springframework', name: 'spring-context', version:springVersion
runtime(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
compile libraries.jackson
compile libraries.pac4j
compile libraries.spring
runtime libraries.hibernate
testCompile project(':cas-server-core-authentication')
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
testCompile project(path: ":cas-server-core-util", configuration: "tests")
Expand Down
37 changes: 7 additions & 30 deletions cas-server-support-x509/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,15 @@ dependencies {
compile project(':cas-server-core-authentication')
compile project(':cas-server-core-util')
compile project(':cas-server-core-web')
compile(group: 'org.cryptacular', name: 'cryptacular', version: cryptacularVersion) {
exclude(module: 'bcprov-jdk15on')
}
compile(group: 'org.springframework.webflow', name: 'spring-webflow', version: springWebflowVersion) {
exclude(module: 'commons-logging')
exclude(module: 'spring-context')
exclude(module: 'spring-web')
exclude(module: 'spring-beans')
exclude(module: 'spring-core')
exclude(module: 'spring-expression')
exclude(module: 'spring-webmvc')
}
compile(group: 'net.sf.ehcache', name: 'ehcache', version: ehcacheVersion) {
exclude(module: 'slf4j-api')
}
compile group: 'org.springframework', name: 'spring-expression', version: springVersion
compile(group: 'org.ldaptive', name: 'ldaptive', version: ldaptiveVersion) {
exclude(module: 'slf4j-api')
}
provided group: 'org.bouncycastle', name: 'bcprov-jdk15on', version:bouncyCastleVersion
compile libraries.bouncycastle
compile libraries.spring
compile libraries.ehcache
compile libraries.ldaptive
compile libraries.hibernate

testCompile project(':cas-server-support-generic')
testCompile project(path: ":cas-server-support-ldap", configuration: "tests")
testCompile(group: 'com.unboundid', name: 'unboundid-ldapsdk', version: unboundidVersion) {
exclude(module: 'slf4j-api')
}
testCompile(group: 'org.ldaptive', name: 'ldaptive-unboundid', version: ldaptiveVersion) {
exclude(module: 'slf4j-api')
}
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
testCompile libraries.tests
testCompile project(':cas-server-core-logout')
testCompile project(':cas-server-core-services')
testCompile project(':cas-server-core')
Expand Down
10 changes: 2 additions & 8 deletions cas-server-support-yubikey/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@

description = 'Apereo CAS YubiKey Support'
dependencies {

compile project(':cas-server-core-authentication')
compile(group: 'org.reflections', name: 'reflections', version: reflectionsVersion) {
exclude(module: 'guava')
}
compile(group: 'com.yubico', name: 'yubico-validation-client2', version:yubicoVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'commons-codec')
}
compile libraries.guava
compile libraries.yubicoapi
}


53 changes: 8 additions & 45 deletions cas-server-webapp-throttle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,58 +1,21 @@
description = 'Apereo CAS Web Application Authentication Throttling'
dependencies {
compile(group: 'org.springframework', name: 'spring-core', version: springVersion) {
exclude(module: 'commons-logging')
}
compile group: 'org.springframework', name: 'spring-jdbc', version: springVersion
compile(group: 'org.quartz-scheduler', name: 'quartz', version: quartzVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'c3p0')
}
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version: inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'aspectjrt')
}
compile(group: 'org.jasig.inspektr', name: 'inspektr-support-spring', version: inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'spring-web')
exclude(module: 'spring-webmvc')
exclude(module: 'spring-tx')
exclude(module: 'spring-beans')
exclude(module: 'spring-jdbc')
exclude(module: 'aspectjrt')
exclude(module: 'validation-api')
}
compile(group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
}
compile(group: 'org.hibernate', name: 'hibernate-entitymanager', version: hibernateVersion) {
exclude(module: 'javassist')
}
compile group: 'org.springframework', name: 'spring-beans', version: springVersion
compile group: 'org.springframework', name: 'spring-context-support', version: springVersion
compile group: 'org.springframework', name: 'spring-webmvc', version: springVersion
compile(group: 'org.reflections', name: 'reflections', version: reflectionsVersion) {
exclude(module: 'guava')
}
compile group: 'org.springframework', name: 'spring-context', version: springVersion
compile libraries.spring
compile libraries.quartz
compile libraries.inspektr
compile libraries.hibernate
compile libraries.guava
compile project(':cas-server-core-web')
compile project(':cas-server-core-util')
runtime group: 'javax.transaction', name: 'jta', version: jtaVersion
runtime(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
runtime libraries.javaximpl

testCompile project(':cas-server-core-authentication')
testCompile project(':cas-server-core-audit')
testCompile project(':cas-server-core')
testCompile project(':cas-server-core-logout')
testCompile project(':cas-server-core-monitor')
testCompile project(path: ":cas-server-core", configuration: "tests")
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
testCompile group: 'org.hsqldb', name: 'hsqldb', version: hsqlVersion
testCompile group: 'org.springframework', name: 'spring-orm', version: springVersion
testCompile libraries.tests
}

0 comments on commit ac4935a

Please sign in to comment.