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
SavvasMisaghMoayyed committed Jan 10, 2016
1 parent 5d6bf9f commit fd0ff9f
Show file tree
Hide file tree
Showing 17 changed files with 145 additions and 561 deletions.
83 changes: 73 additions & 10 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ ext.libraries = [
],
bouncycastle : [
"org.bouncycastle:bcpkix-jdk15on:$bouncyCastleVersion",
"org.cryptacular:cryptacular:$cryptacularVersion",
dependencies.create("org.cryptacular:cryptacular:$cryptacularVersion") {
exclude(module: 'bcprov-jdk15on')
force = true
},
"org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
],

Expand Down Expand Up @@ -59,10 +62,12 @@ ext.libraries = [
dependencies.create("org.hibernate:hibernate-core:$hibernateVersion") {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
exclude(module: 'xml-apis')
force = true
},
dependencies.create("org.hibernate:hibernate-entitymanager:$hibernateVersion") {
exclude(module: 'javassist')
exclude(module: 'xml-apis')
force = true
},
dependencies.create("org.hibernate:hibernate-validator:$hibernateValidatorVersion") {
Expand All @@ -72,18 +77,28 @@ ext.libraries = [
},
"com.mchange:c3p0:$c3p0Version"
],
httpclient : "org.apache.httpcomponents:httpclient:$httpclientVersion",
httpclient : dependencies.create("org.apache.httpcomponents:httpclient:$httpclientVersion") {
exclude(module: 'commons-codec')
force = true
},
shibidp : [
"net.shibboleth.idp:idp-attribute-filter-api:$idpVersion",
"net.shibboleth.idp:idp-attribute-resolver-api:$idpVersion",
"net.shibboleth.idp:idp-core:$idpVersion",
dependencies.create("net.shibboleth.idp:idp-core:$idpVersion") {
exclude(module: 'guava')
exclude(module: 'joda-time')
force = true
},
"net.shibboleth.idp:idp-installer:$idpVersion",
"net.shibboleth.idp:idp-profile-spring:$idpVersion",
"net.shibboleth.idp:idp-saml-impl:$idpVersion",
dependencies.create("net.shibboleth.idp:idp-saml-impl:$idpVersion") {
exclude(module: 'httpclient')
force = true
},
dependencies.create("net.shibboleth.utilities:java-support:$shibbolethUtilJavaSupport") {
exclude(module: 'guava')
exclude(module: 'joda-time')
force = true
force = true
}
],
ignite : [
Expand Down Expand Up @@ -142,7 +157,10 @@ ext.libraries = [
"jcifs:jcifs:$jcifsVersion",
"org.samba.jcifs:jcifs-ext:$jcifsExtVersion",
],
jdom : "jdom:jdom:$jdomVersion",
jdom : dependencies.create("jdom:jdom:$jdomVersion") {
exclude(module: 'xml-apis')
force = true
},
jodatime : "joda-time:joda-time:$jodaTimeVersion",
jose4j : "org.bitbucket.b_c:jose4j:$jose4jVersion",
jradius : [
Expand Down Expand Up @@ -215,21 +233,45 @@ ext.libraries = [
mongo : "org.mongodb:mongo-java-driver:$mongoDriverVersion",
openid4java : "org.openid4java:openid4java:$openidVersion",
opensaml : [
"org.opensaml:opensaml-core:$opensamlVersion",
"org.opensaml:opensaml-saml-api:$opensamlVersion",
"org.opensaml:opensaml-soap-api:$opensamlVersion"
dependencies.create("org.opensaml:opensaml-core:$opensamlVersion") {
exclude(module: 'bcprov-jdk15on')
force = true
},
dependencies.create("org.opensaml:opensaml-saml-api:$opensamlVersion") {
exclude(module: 'bcprov-jdk15on')
force = true
},
dependencies.create("org.opensaml:opensaml-security-api:$opensamlVersion") {
exclude(module: 'bcprov-jdk15on')
force = true
},
dependencies.create("org.opensaml:opensaml-soap-api:$opensamlVersion") {
exclude(module: 'bcprov-jdk15on')
force = true
}
],
pac4j : [
dependencies.create("org.pac4j:pac4j-cas:$pac4jVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'joda-time')
exclude(module: 'jcl-over-slf4j')
force = true
},
dependencies.create("org.pac4j:pac4j-config:$pac4jVersion") {
exclude(module: 'commons-lang3')
exclude(module: 'slf4j-api')
exclude(module: 'joda-time')
exclude(module: 'spring-core')
exclude(module: 'jcl-over-slf4j')
exclude(module: 'jackson-databind')
exclude(module: 'guava')
exclude(module: 'cryptacular')
exclude(module: 'bcprov-jdk15on')
exclude(module: 'commons-codec')
exclude(module: 'httpclient')
exclude(module: 'httpclient-cache')
exclude(module: 'commons-httpclient')
exclude(module: 'json-smart')
force = true
},
dependencies.create("org.pac4j:pac4j-core:$pac4jVersion") {
Expand All @@ -241,36 +283,51 @@ ext.libraries = [
exclude(module: 'commons-lang3')
exclude(module: 'slf4j-api')
exclude(module: 'joda-time')
exclude(module: 'jcl-over-slf4j')
force = true
},
dependencies.create("org.pac4j:pac4j-jwt:$pac4jVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'jcl-over-slf4j')
force = true
},
dependencies.create("org.pac4j:pac4j-mongo:$pac4jVersion") {
exclude(module: 'commons-lang3')
exclude(module: 'jcl-over-slf4j')
exclude(module: 'slf4j-api')
exclude(module: 'joda-time')
force = true
},
dependencies.create("org.pac4j:pac4j-oauth:$pac4jVersion") {
exclude(module: 'commons-lang3')
exclude(module: 'slf4j-api')
exclude(module: 'jcl-over-slf4j')
exclude(module: 'joda-time')
exclude(module: 'jackson-databind')
force = true
},
dependencies.create("org.pac4j:pac4j-saml:$pac4jVersion") {
exclude(module: 'commons-lang3')
exclude(module: 'jcl-over-slf4j')
exclude(module: 'slf4j-api')
exclude(module: 'joda-time')
exclude(module: 'xml-apis')
exclude(module: 'guava')
exclude(module: 'spring-core')
exclude(module: 'cryptacular')
exclude(module: 'commons-codec')
exclude(module: 'httpclient')
exclude(module: 'httpclient-cache')
exclude(module: 'commons-httpclient')
force = true
},
dependencies.create("org.pac4j:pac4j-stormpath:$pac4jVersion") {
exclude(module: 'commons-lang3')
exclude(module: 'slf4j-api')
exclude(module: 'joda-time')
exclude(module: 'jcl-over-slf4j')
exclude(module: 'commons-codec')
exclude(module: 'httpclient')
force = true
},
dependencies.create("org.pac4j:spring-webmvc-pac4j:$springWebmvcPac4jVersion") {
Expand All @@ -279,6 +336,7 @@ ext.libraries = [
exclude(module: 'slf4j-api')
exclude(module: 'pac4j-core')
exclude(module: 'joda-time')
exclude(module: 'jcl-over-slf4j')
force = true
}

Expand Down Expand Up @@ -317,7 +375,9 @@ ext.libraries = [
exclude(module: 'spring-core')
exclude(module: 'spring-expression')
exclude(module: 'spring-webmvc')
force = true
exclude(module: 'spring-tx')
exclude(module: 'mongo-java-driver')
force = true
},
"org.springframework:spring-expression:$springVersion",
"org.springframework:spring-jdbc:$springVersion",
Expand All @@ -343,6 +403,9 @@ ext.libraries = [
exclude(module: 'spring-core')
exclude(module: 'spring-beans')
exclude(module: 'bcprov-jdk15on')
exclude(module: 'jcl-over-slf4j')
exclude(module: 'cryptacular')
exclude(module: 'bcprov-jdk15on')
force = true
},
"org.springframework:spring-webmvc:$springVersion"
Expand Down
1 change: 1 addition & 0 deletions cas-management-webapp/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configurations {
}
}


gretty {
jvmArgs = ["-Dorg.eclipse.jetty.annotations.maxWait=120","-Xdebug","-Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n"]
scanInterval = 5
Expand Down
5 changes: 1 addition & 4 deletions cas-server-support-basic/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ dependencies {
compile project(':cas-server-core-api')
compile project(':cas-server-core-webflow')
compile project(':cas-server-core-web')
compile(group: 'org.pac4j', name: 'pac4j-http', version: pac4jVersion) {
exclude(module: 'commons-lang3')
exclude(module: 'slf4j-api')
}
compile libraries.pac4j
}

39 changes: 5 additions & 34 deletions cas-server-support-jdbc-monitor/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,11 @@ dependencies {

compile project(':cas-server-core-monitor')
compile project(':cas-server-core-authentication')
compile group: 'org.apache.commons', name: 'commons-lang3', version: commonsLangVersion
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')
}
runtime group: 'javax.transaction', name: 'jta', version: jtaVersion
compile group: 'org.springframework', name: 'spring-orm', version: springVersion
compile(group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
}
compile(group: 'org.apache.shiro', name: 'shiro-core', version: shiroVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'org.hibernate', name: 'hibernate-entitymanager', version: hibernateVersion) {
exclude(module: 'javassist')
}
compile group: 'org.springframework', name: 'spring-context', version: springVersion
runtime group: 'com.mchange', name: 'c3p0', version: c3p0Version
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
testCompile group: 'org.hsqldb', name: 'hsqldb', version: hsqlVersion
testCompile(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 libraries.spring
compile libraries.quartz
compile libraries.hibernate
runtime libraries.javaximpl
testCompile libraries.tests
testCompile project(':cas-server-core-authentication')
testCompile project(':cas-server-core-util')
}
Expand Down
17 changes: 5 additions & 12 deletions cas-server-support-jdbc/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,13 @@ description = 'Apereo CAS JDBC Support'
dependencies {

compile project(':cas-server-core-authentication')
compile(group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
}
compile group: 'org.springframework', name: 'spring-jdbc', version: springVersion
compile group: 'org.springframework', name: 'spring-orm', version: springVersion
compile project(':cas-server-core-monitor')
runtime group: 'javax.transaction', name:'jta', version: jtaVersion
compile libraries.spring
compile libraries.quartz
compile libraries.hibernate
runtime libraries.javaximpl
testCompile libraries.tests
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
testCompile project(':cas-server-core-util')
testCompile group: 'org.hsqldb', name: 'hsqldb', version: hsqlVersion
testCompile(group: 'org.hibernate', name: 'hibernate-entitymanager', version: hibernateVersion) {
exclude(module: 'javassist')
}
}


39 changes: 5 additions & 34 deletions cas-server-support-jpa-service-registry/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,11 @@ description = 'Apereo CAS JPA Service Registry Support'
dependencies {

compile project(':cas-server-core-services')
compile group: 'org.apache.commons', name: 'commons-lang3', version: commonsLangVersion
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.springframework', name: 'spring-orm', version: springVersion
compile(group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
}
compile(group: 'org.apache.shiro', name: 'shiro-core', version: shiroVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'org.hibernate', name: 'hibernate-entitymanager', version: hibernateVersion) {
exclude(module: 'javassist')
}
compile group: 'org.springframework', name: 'spring-context', version: springVersion
runtime group: 'com.mchange', name: 'c3p0', version: c3p0Version
runtime group: 'javax.transaction', name:'jta', version: jtaVersion
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
testCompile group: 'org.hsqldb', name: 'hsqldb', version: hsqlVersion
testCompile(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 libraries.spring
compile libraries.quartz
compile libraries.hibernate
runtime libraries.javaximpl
testCompile libraries.tests
testCompile project(':cas-server-core-authentication')
testCompile project(':cas-server-core-tickets')
testCompile project(':cas-server-support-oauth')
Expand Down
39 changes: 5 additions & 34 deletions cas-server-support-jpa-ticket-registry/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,12 @@ dependencies {
compile project(':cas-server-core-tickets')
compile project(':cas-server-core-monitor')
compile project(':cas-server-core-util')
compile group: 'org.apache.commons', name: 'commons-lang3', version: commonsLangVersion
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.springframework', name: 'spring-orm', version: springVersion
compile(group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion) {
exclude(module: 'jboss-logging-annotations')
exclude(module: 'javassist')
}
compile(group: 'org.apache.shiro', name: 'shiro-core', version: shiroVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'org.hibernate', name: 'hibernate-entitymanager', version: hibernateVersion) {
exclude(module: 'javassist')
}
compile group: 'org.springframework', name: 'spring-context', version: springVersion
runtime group: 'com.mchange', name: 'c3p0', version: c3p0Version
runtime group: 'javax.transaction', name:'jta', version: jtaVersion
compile libraries.spring
compile libraries.quartz
compile libraries.hibernate
runtime libraries.javaximpl
testCompile project(path: ":cas-server-core-util", configuration: "tests")
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
testCompile group: 'org.hsqldb', name: 'hsqldb', version: hsqlVersion
testCompile(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')
}
testCompile libraries.tests
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
testCompile project(':cas-server-core-logout')
testCompile project(':cas-server-core-services')
Expand Down
Loading

0 comments on commit fd0ff9f

Please sign in to comment.