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 fd0ff9f commit 66a14e0
Show file tree
Hide file tree
Showing 39 changed files with 205 additions and 625 deletions.
118 changes: 103 additions & 15 deletions build.gradle
Expand Up @@ -41,14 +41,31 @@ ext.libraries = [
"org.apache.commons:commons-lang3:$commonsLangVersion"
],
ehcache : [
"net.sf.ehcache:ehcache:$ehcacheVersion",
"org.ehcache:jcache:$jcacheVersion",
dependencies.create("net.sf.ehcache:ehcache:$ehcacheVersion") {
exclude(module: 'slf4j-api')
force = true
},
dependencies.create("org.ehcache:jcache:$jcacheVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'ehcache')
force = true
}
],
findbugscontrib : "com.mebigfatguy.fb-contrib:fb-contrib:$findbugsContribVersion",
findbugs : "com.google.code.findbugs:findbugs:$findbugsVersion",
findbugssec : "com.h3xstream.findsecbugs:findsecbugs-plugin:$findbugsSecVersion",
groovy : "org.codehaus.groovy:groovy-jsr223:$groovyVersion",
grouper : "edu.internet2.middleware.grouper:grouperClient:$grouperVersion",
grouper : dependencies.create("edu.internet2.middleware.grouper:grouperClient:$grouperVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'junit')
exclude(module: 'joda-time')
exclude(module: 'commons-logging')
exclude(module: 'xml-apis')
exclude(module: 'xom')
exclude(module: 'commons-lang')
exclude(module: 'commons-beanutils')
force = true
},
guava : [
"com.google.guava:guava:$guavaVersion",
dependencies.create("org.reflections:reflections:$reflectionsVersion") {
Expand Down Expand Up @@ -104,13 +121,43 @@ ext.libraries = [
ignite : [
"org.apache.ignite:ignite-core:$igniteVersion",
"org.apache.ignite:ignite-log4j:$igniteVersion",
"org.apache.ignite:ignite-spring:$igniteVersion"
dependencies.create("org.apache.ignite:ignite-spring:$igniteVersion") {
exclude(module: 'commons-logging')
exclude(module: 'spring-core')
exclude(module: 'spring-beans')
exclude(module: 'spring-context')
exclude(module: 'spring-aop')
exclude(module: 'spring-expression')
exclude(module: 'spring-jdbc')
exclude(module: 'spring-tx')
force = true
}
],
infinispan : [
"org.infinispan:infinispan-cachestore-remote:$infinispanVersion",
"org.infinispan:infinispan-commons:$infinispanVersion",
"org.infinispan:infinispan-core:$infinispanVersion",
"org.infinispan:infinispan-embedded:$infinispanVersion"
dependencies.create("org.infinispan:infinispan-cachestore-remote:$infinispanVersion") {
exclude(module: 'guava')
exclude(module: 'leveldb-api')
exclude(module: 'leveldbjni')
exclude(module: 'jboss-logging')
force = true
},
dependencies.create("org.infinispan:infinispan-commons:$infinispanVersion") {
exclude(module: 'guava')
exclude(module: 'jboss-logging')
force = true
},
dependencies.create("org.infinispan:infinispan-core:$infinispanVersion") {
exclude(module: 'guava')
exclude(module: 'jboss-logging')
force = true
},
dependencies.create("org.infinispan:infinispan-embedded:$infinispanVersion") {
exclude(module: 'guava')
exclude(module: 'leveldb-api')
exclude(module: 'leveldbjni')
exclude(module: 'jboss-logging')
force = true
}
],
inspektr : [
dependencies.create("org.jasig.inspektr:inspektr-aspects:$inspektrVersion") {
Expand Down Expand Up @@ -164,7 +211,20 @@ ext.libraries = [
jodatime : "joda-time:joda-time:$jodaTimeVersion",
jose4j : "org.bitbucket.b_c:jose4j:$jose4jVersion",
jradius : [
"com.github.coova:jradius:$jradiusVersion",
dependencies.create("com.github.coova:jradius:$jradiusVersion") {
exclude(module: 'commons-logging')
exclude(module: 'log4j')
exclude(module: 'slf4j-api')
exclude(module: 'commons-collections')
exclude(module: 'commons-beanutils')
exclude(module: 'bcprov-jdk15')
exclude(module: 'slf4j-log4j12')
exclude(module: 'spring-beans')
exclude(module: 'spring-context')
exclude(module: 'spring-context-support')
exclude(module: 'spring-core')
force = true
},
"gnu.getopt:java-getopt:1.0.13"
],
tests : [
Expand All @@ -182,16 +242,27 @@ ext.libraries = [
force = true
},
"com.github.fakemongo:fongo:$fongoVersion",
"de.flapdoodle.embed:de.flapdoodle.embed.memcached:$memcachedEmbeddedVersion",
dependencies.create("de.flapdoodle.embed:de.flapdoodle.embed.memcached:$memcachedEmbeddedVersion") {
exclude(module: 'commons-lang3')
exclude(module: 'spymemcached')
exclude(module: 'slf4j-api')
force = true
},
"org.hsqldb:hsqldb:$hsqlVersion",
"org.skyscreamer:jsonassert:$jsonassertVersion",
"org.springframework:spring-test:$springVersion"
],
memcached : [
"net.spy:spymemcached:$spymemcachedVersion",
"com.esotericsoftware:kryo:$kryoVersion",
"de.javakaffee:kryo-serializers:$kryoSerializersVersion",
"org.jasig.inspektr:inspektr-support-spring:$inspektrVersion"
dependencies.create("com.esotericsoftware:kryo:$kryoVersion") {
exclude(module: 'spymemcached')
force = true
}
dependencies.create("de.javakaffee:kryo-serializers:$kryoSerializersVersion") {
exclude(module: 'kryo')
force = true
}

],
ldaptive : [
"org.ldaptive:ldaptive:$ldaptiveVersion",
Expand Down Expand Up @@ -231,7 +302,12 @@ ext.libraries = [
}
],
mongo : "org.mongodb:mongo-java-driver:$mongoDriverVersion",
openid4java : "org.openid4java:openid4java:$openidVersion",
openid4java : dependencies.create("org.openid4java:openid4java:$openidVersion") {
exclude(module: 'xercesImpl')
exclude(module: 'httpclient')
exclude(module: 'commons-logging')
force = true
},
opensaml : [
dependencies.create("org.opensaml:opensaml-core:$opensamlVersion") {
exclude(module: 'bcprov-jdk15on')
Expand Down Expand Up @@ -341,7 +417,19 @@ ext.libraries = [
}

],
persondirectory : "org.jasig.service.persondir:person-directory-impl:$personDirectoryVersion",
persondirectory : dependencies.create("org.jasig.service.persondir:person-directory-impl:$personDirectoryVersion") {
exclude(module: 'commons-logging')
exclude(module: 'slf4j-api')
exclude(module: 'commons-lang3')
exclude(module: 'commons-collections4')
exclude(module: 'spring-beans')
exclude(module: 'ldaptive')
exclude(module: 'spring-context')
exclude(module: 'spring-core')
exclude(module: 'spring-tx')
exclude(module: 'guava')
force = true
},
quartz : dependencies.create("org.quartz-scheduler:quartz:$quartzVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'c3p0')
Expand Down
2 changes: 0 additions & 2 deletions cas-server-core-api-logout/build.gradle
Expand Up @@ -2,8 +2,6 @@
description = 'Apereo CAS Core Logout APIs'
dependencies {
compile project(':cas-server-core-api-services')
compile group: 'org.apache.commons', name: 'commons-lang3', version:commonsLangVersion
compile group: 'joda-time', name: 'joda-time', version:jodaTimeVersion
compile project(':cas-server-core-api-authentication')
compile project(':cas-server-core-api-ticket')
}
Expand Down
4 changes: 0 additions & 4 deletions cas-server-core-api-services/build.gradle
@@ -1,10 +1,6 @@

description = 'Apereo CAS Core Services APIs'
dependencies {

compile group: 'org.apache.commons', name: 'commons-lang3', version:commonsLangVersion
compile group: 'joda-time', name: 'joda-time', version:jodaTimeVersion
compile group: 'com.google.guava', name: 'guava', version:guavaVersion
compile project(':cas-server-core-api-authentication')
}

17 changes: 5 additions & 12 deletions cas-server-core-audit/build.gradle
@@ -1,20 +1,13 @@
description = 'Apereo CAS Core Audit'
dependencies {
compile project(':cas-server-core-api')
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version: inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'aspectjrt')
}
compile(group: 'org.pac4j', name: 'pac4j-core', version: pac4jVersion) {
exclude(module: 'slf4j-api')
}
compile libraries.pac4j
compile libraries.inspektr
compile libraries.persondirectory
compile libraries.spring
compile libraries.hibernate
compile project(':cas-server-core-web')
compile project(':cas-server-core-util')
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
testCompile project(':cas-server-core-logout')
testCompile project(':cas-server-core-monitor')
testCompile project(':cas-server-core-util')
Expand Down
42 changes: 5 additions & 37 deletions cas-server-core-authentication/build.gradle
Expand Up @@ -2,43 +2,11 @@ description = 'Apereo CAS Core Authentication'
dependencies {
compile project(':cas-server-core-api-services')
compile project(':cas-server-core-api-ticket')
compile(group: 'io.dropwizard.metrics', name: 'metrics-annotation', version: dropwizardMetricsVersion) {
exclude(module: 'slf4j-api')
}
compile project(':cas-server-core-util')
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.service.persondir', name: 'person-directory-impl', version: personDirectoryVersion) {
exclude(module: 'commons-logging')
exclude(module: 'slf4j-api')
exclude(module: 'commons-lang3')
exclude(module: 'spring-beans')
exclude(module: 'spring-context')
exclude(module: 'spring-core')
exclude(module: 'spring-tx')
exclude(module: 'ldaptive')
exclude(module: 'guava')
}
compile(group: 'org.springframework.webflow', name: 'spring-binding', version: springWebflowVersion) {
exclude(module: 'commons-logging')
exclude(module: 'spring-beans')
exclude(module: 'spring-context')
exclude(module: 'spring-core')
exclude(module: 'spring-expression')
exclude(module: 'spring-webmvc')
}
compile libraries.metrics
compile libraries.inspektr
compile libraries.persondirectory
compile libraries.spring
compile libraries.hibernate
testCompile project(':cas-server-core-web')
testCompile(group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
}
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
exclude(module: 'xml-apis')
}
}

13 changes: 1 addition & 12 deletions cas-server-core-logging/build.gradle
@@ -1,18 +1,7 @@
description = 'Apereo CAS Core Logging'
dependencies {
compile project(':cas-server-core-api-ticket')
compile(group: 'org.reflections', name: 'reflections', version: reflectionsVersion) {
exclude(module: 'guava')
}
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
compile(group: 'org.springframework', name: 'spring-core', version: springVersion) {
exclude(module: 'commons-logging')
}
compile group: 'commons-io', name: 'commons-io', version: commonsIoVersion
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-context', version: springVersion
compile group: 'org.springframework', name: 'spring-webmvc', version: springVersion
compile libraries.spring
}


12 changes: 1 addition & 11 deletions cas-server-core-monitor/build.gradle
Expand Up @@ -3,17 +3,7 @@ description = 'Apereo CAS Core Monitor Support'
dependencies {
compile project(':cas-server-core-api-monitor')
compile project(':cas-server-core-api-ticket')
compile group: 'com.google.guava', name: 'guava', version:guavaVersion
compile(group: 'org.reflections', name: 'reflections', version: reflectionsVersion) {
exclude(module: 'guava')
}
compile(group: 'org.springframework', name: 'spring-core', version:springVersion) {
exclude(module: 'commons-logging')
}
compile group: 'org.springframework', name: 'spring-beans', version:springVersion
compile group: 'org.springframework', name: 'spring-webmvc', version:springVersion
compile group: 'org.springframework', name: 'spring-context-support', version:springVersion
compile group: 'org.springframework', name: 'spring-context', version:springVersion
compile libraries.spring
testCompile project(':cas-server-core-tickets')
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
testCompile project(path: ":cas-server-core-util", configuration: "tests")
Expand Down
35 changes: 8 additions & 27 deletions cas-server-core-services/build.gradle
Expand Up @@ -2,38 +2,19 @@
description = 'Apereo CAS Core Services'
dependencies {
compile project(':cas-server-core-api-services')
compile(group: 'org.hibernate', name: 'hibernate-core', version:hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
exclude(module: 'xml-apis')
}
compile group: 'commons-io', name: 'commons-io', version:commonsIoVersion
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:jacksonDatabindVersion
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'aspectjrt')
}
compile group: 'com.google.guava', name: 'guava', version:guavaVersion
compile group: 'org.springframework', name: 'spring-orm', version:springVersion
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.reflections', name: 'reflections', version: reflectionsVersion) {
exclude(module: 'guava')
}
compile libraries.hibernate
compile libraries.spring
compile libraries.quartz
compile libraries.jackson
compile libraries.httpclient
compile libraries.inspektr


compile project(':cas-server-core-util')
compile project(':cas-server-core-events')
compile project(':cas-server-core-web')
testCompile project(path: ":cas-server-core-util", configuration: "tests")
testCompile project(':cas-server-core-authentication')
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")

testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
}

15 changes: 3 additions & 12 deletions cas-server-core-tickets/build.gradle
Expand Up @@ -2,21 +2,12 @@
description = 'Apereo CAS Core Tickets'
dependencies {
compile project(':cas-server-core-api-ticket')
compile(group: 'org.hibernate', name: 'hibernate-core', version:hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
exclude(module: 'xml-apis')
}
compile(group: 'org.reflections', name: 'reflections', version: reflectionsVersion) {
exclude(module: 'guava')
}
compile libraries.hibernate
compile libraries.quartz

compile project(':cas-server-core-authentication')
compile project(':cas-server-core-util')
compile project(':cas-server-core-web')
compile(group: 'org.quartz-scheduler', name: 'quartz', version:quartzVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'c3p0')
}
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
testCompile project(path: ":cas-server-core-util", configuration: "tests")
testCompile project(':cas-server-core-services')
Expand Down

0 comments on commit 66a14e0

Please sign in to comment.