Skip to content

Commit

Permalink
working on external props
Browse files Browse the repository at this point in the history
  • Loading branch information
SavvasMisaghMoayyed committed Nov 8, 2015
1 parent 32f9457 commit bbe09d5
Show file tree
Hide file tree
Showing 50 changed files with 342 additions and 324 deletions.
14 changes: 7 additions & 7 deletions cas-management-webapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
exclude(module: 'spring-expression')
exclude(module: 'spring-web')
}
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:'$inspektrVersion') {
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'aspectjrt')
Expand All @@ -25,7 +25,7 @@ dependencies {
exclude(module: 'spring-web')
}
compile group: 'org.springframework', name: 'spring-aop', version:springVersion
compile(group: 'org.springframework.webflow', name: 'spring-binding', version:'$inspektrVersion') {
compile(group: 'org.springframework.webflow', name: 'spring-binding', version:springWebflowVersion) {
exclude(module: 'commons-logging')
exclude(module: 'spring-beans')
exclude(module: 'spring-context')
Expand All @@ -41,7 +41,7 @@ dependencies {
compile project(':cas-server-core-tickets')
compile project(':cas-server-core-audit')
compile project(':cas-server-support-oauth')
compile(group: 'org.jasig.cas.client', name: 'cas-client-core', version:'3.4.1') {
compile(group: 'org.jasig.cas.client', name: 'cas-client-core', version:casClientVersion) {
exclude(module: 'servlet-api')
exclude(module: 'log4j-over-slf4j')
exclude(module: 'bcprov-jdk15')
Expand All @@ -54,8 +54,8 @@ dependencies {
}
compile group: 'org.springframework', name: 'spring-beans', version:springVersion
compile group: 'org.springframework', name: 'spring-webmvc', version:springVersion
compile group: 'javax.servlet', name: 'jstl', version:'1.2'
runtime(group: 'org.jasig.inspektr', name: 'inspektr-support-spring', version:'$inspektrVersion') {
compile group: 'javax.servlet', name: 'jstl', version:javaxJstlVersion
runtime(group: 'org.jasig.inspektr', name: 'inspektr-support-spring', version:inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'spring-web')
Expand Down Expand Up @@ -85,8 +85,8 @@ dependencies {
exclude(module: 'spring-expression')
exclude(module: 'spring-web')
}
runtime group: 'org.apache.logging.log4j', name: 'log4j-web', version:'$log4jVersion'
runtime group: 'taglibs', name: 'standard', version:'1.1.2'
runtime group: 'org.apache.logging.log4j', name: 'log4j-web', version:log4jVersion
runtime group: 'taglibs', name: 'standard', version:taglibsVersion
runtime(group: 'org.hibernate', name: 'hibernate-validator', version:hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
Expand Down
6 changes: 3 additions & 3 deletions cas-server-core-api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

description = 'Apereo CAS Core APIs'
dependencies {
compile group: 'org.apache.commons', name: 'commons-collections4', version:'4.0'
compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.4'
compile group: 'joda-time', name: 'joda-time', version:'2.8.2'
compile group: 'org.apache.commons', name: 'commons-collections4', version:commonsCollectionsVersion
compile group: 'org.apache.commons', name: 'commons-lang3', version:commonsLangVersion
compile group: 'joda-time', name: 'joda-time', version:jodaTimeVersion
}

4 changes: 2 additions & 2 deletions cas-server-core-audit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = 'Apereo CAS Core Audit'
dependencies {
compile project(':cas-server-core-api')
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:'$inspektrVersion') {
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'aspectjrt')
Expand All @@ -16,7 +16,7 @@ dependencies {
exclude(module: 'spring-web')
}
compile project(':cas-server-core-util')
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:'5.2.1.Final') {
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
Expand Down
15 changes: 7 additions & 8 deletions cas-server-core-authentication/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@

description = 'Apereo CAS Core Authentication'
dependencies {
compile project(':cas-server-core-api')
compile(group: 'io.dropwizard.metrics', name: 'metrics-annotation', version:'3.1.2') {
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') {
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:'1.7.0') {
compile(group: 'org.jasig.service.persondir', name: 'person-directory-impl', version:personDirectoryVersion) {
exclude(module: 'commons-logging')
exclude(module: 'slf4j-api')
exclude(module: 'commons-lang3')
Expand All @@ -22,7 +21,7 @@ dependencies {
exclude(module: 'spring-tx')
exclude(module: 'ldaptive')
}
compile(group: 'org.springframework.webflow', name: 'spring-binding', version:'2.4.2.RELEASE') {
compile(group: 'org.springframework.webflow', name: 'spring-binding', version:springWebflowVersion) {
exclude(module: 'commons-logging')
exclude(module: 'spring-beans')
exclude(module: 'spring-context')
Expand All @@ -31,14 +30,14 @@ dependencies {
exclude(module: 'spring-webmvc')
}
testCompile project(':cas-server-core-web')
testCompile(group: 'org.hibernate', name: 'hibernate-core', version:'5.0.0.Final') {
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:'5.2.1.Final') {
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
exclude(module: 'xml-apis')
}
}
}

4 changes: 2 additions & 2 deletions cas-server-core-logging/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
description = 'Apereo CAS Core Logging'
dependencies {
compile project(':cas-server-core-api')
compile group: 'org.reflections', name: 'reflections', version:'0.9.10'
compile group: 'org.reflections', name: 'reflections', version:reflectionsVersion
compile(group: 'org.springframework', name: 'spring-core', version:springVersion) {
exclude(module: 'commons-logging')
}
compile group: 'commons-io', name: 'commons-io', version:'2.4'
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
Expand Down
4 changes: 2 additions & 2 deletions cas-server-core-monitor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
description = 'Apereo CAS Core Monitor Support'
dependencies {
compile project(':cas-server-core-api')
compile group: 'com.google.guava', name: 'guava', version:'18.0'
compile group: 'org.reflections', name: 'reflections', version:'0.9.10'
compile group: 'com.google.guava', name: 'guava', version:guavaVersion
compile group: 'org.reflections', name: 'reflections', version:reflectionsVersion
compile(group: 'org.springframework', name: 'spring-core', version:springVersion) {
exclude(module: 'commons-logging')
}
Expand Down
16 changes: 8 additions & 8 deletions cas-server-core-services/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
description = 'Apereo CAS Core Services'
dependencies {
compile project(':cas-server-core-api')
compile(group: 'org.hibernate', name: 'hibernate-core', version:'5.0.0.Final') {
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:'2.4'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.6.1'
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:'$inspektrVersion') {
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:'18.0'
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:'2.2.1') {
compile(group: 'org.quartz-scheduler', name: 'quartz', version:quartzVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'c3p0')
}
compile group: 'org.reflections', name: 'reflections', version:'0.9.10'
compile group: 'org.reflections', name: 'reflections', version:reflectionsVersion
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:'5.2.1.Final') {
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
}
Expand Down
6 changes: 3 additions & 3 deletions cas-server-core-tickets/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
description = 'Apereo CAS Core Tickets'
dependencies {
compile project(':cas-server-core-api')
compile(group: 'org.hibernate', name: 'hibernate-core', version:'5.0.0.Final') {
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:'0.9.10'
compile group: 'org.reflections', name: 'reflections', version:reflectionsVersion
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:'2.2.1') {
compile(group: 'org.quartz-scheduler', name: 'quartz', version:quartzVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'c3p0')
}
Expand Down
18 changes: 9 additions & 9 deletions cas-server-core-util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ dependencies {
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.apache.shiro', name: 'shiro-core', version:'1.2.4') {
compile(group: 'org.apache.shiro', name: 'shiro-core', version:shiroVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'org.quartz-scheduler', name: 'quartz', version:'2.2.1') {
compile(group: 'org.quartz-scheduler', name: 'quartz', version:quartzVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'c3p0')
}
compile group: 'commons-codec', name: 'commons-codec', version:'1.10'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.6.1'
compile(group: 'org.bitbucket.b_c', name: 'jose4j', version:'0.4.4') {
compile group: 'commons-codec', name: 'commons-codec', version:commonsCodecVersion
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:jacksonDatabindVersion
compile(group: 'org.bitbucket.b_c', name: 'jose4j', version:jose4jVersion) {
exclude(module: 'slf4j-api')
}
compile group: 'com.google.guava', name: 'guava', version:'18.0'
compile group: 'commons-io', name: 'commons-io', version:'2.4'
compile(group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.5') {
compile group: 'com.google.guava', name: 'guava', version:guavaVersion
compile group: 'commons-io', name: 'commons-io', version:commonsIoVersion
compile(group: 'org.apache.httpcomponents', name: 'httpclient', version:httpclientVersion) {
exclude(module: 'commons-codec')
}
compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.4'
compile group: 'org.apache.commons', name: 'commons-lang3', version:commonsLangVersion
compile group: 'org.springframework', name: 'spring-webmvc', version:springVersion
}

2 changes: 1 addition & 1 deletion cas-server-core-web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = 'Apereo CAS Core Web'
dependencies {
compile project(':cas-server-core-api')
compile(group: 'org.springframework.webflow', name: 'spring-webflow', version:'2.4.2.RELEASE') {
compile(group: 'org.springframework.webflow', name: 'spring-webflow', version:springWebflowVersion) {
exclude(module: 'commons-logging')
exclude(module: 'spring-context')
exclude(module: 'spring-web')
Expand Down
36 changes: 18 additions & 18 deletions cas-server-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ dependencies {
compile project(':cas-server-core-tickets')
compile project(':cas-server-core-validation')
compile project(':cas-server-core-authentication')
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:'$inspektrVersion') {
compile(group: 'org.jasig.inspektr', name: 'inspektr-audit', version:inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'validation-api')
exclude(module: 'aspectjrt')
}
compile(group: 'io.dropwizard.metrics', name: 'metrics-core', version:'3.1.2') {
compile(group: 'io.dropwizard.metrics', name: 'metrics-core', version:dropwizardMetricsVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'io.dropwizard.metrics', name: 'metrics-annotation', version:'3.1.2') {
compile(group: 'io.dropwizard.metrics', name: 'metrics-annotation', version:dropwizardMetricsVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'org.jasig.service.persondir', name: 'person-directory-impl', version:'1.7.0') {
compile(group: 'org.jasig.service.persondir', name: 'person-directory-impl', version:personDirectoryVersion) {
exclude(module: 'commons-logging')
exclude(module: 'slf4j-api')
exclude(module: 'commons-lang3')
Expand All @@ -28,8 +28,8 @@ dependencies {
exclude(module: 'spring-tx')
exclude(module: 'ldaptive')
}
compile group: 'commons-codec', name: 'commons-codec', version:'1.10'
compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.4'
compile group: 'commons-codec', name: 'commons-codec', version:commonsCodecVersion
compile group: 'org.apache.commons', name: 'commons-lang3', version:commonsLangVersion
compile(group: 'org.springframework', name: 'spring-core', version:springVersion) {
exclude(module: 'commons-logging')
}
Expand All @@ -38,40 +38,40 @@ dependencies {
compile group: 'org.springframework', name: 'spring-context-support', version:springVersion
compile group: 'org.springframework', name: 'spring-tx', version:springVersion
compile group: 'org.springframework', name: 'spring-context', version:springVersion
compile(group: 'org.hibernate', name: 'hibernate-core', version:'5.0.0.Final') {
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:'2.4'
compile group: 'joda-time', name: 'joda-time', version:'2.8.2'
compile group: 'com.google.guava', name: 'guava', version:'18.0'
compile group: 'org.apache.commons', name: 'commons-collections4', version:'4.0'
compile(group: 'org.apache.shiro', name: 'shiro-core', version:'1.2.4') {
compile group: 'commons-io', name: 'commons-io', version:commonsIoVersion
compile group: 'joda-time', name: 'joda-time', version:jodaTimeVersion
compile group: 'com.google.guava', name: 'guava', version:guavaVersion
compile group: 'org.apache.commons', name: 'commons-collections4', version:commonsCollectionsVersion
compile(group: 'org.apache.shiro', name: 'shiro-core', version:shiroVersion) {
exclude(module: 'slf4j-api')
}
runtime(group: 'commons-jexl', name: 'commons-jexl', version:'1.1') {
runtime(group: 'commons-jexl', name: 'commons-jexl', version:commonsJexlVersion) {
exclude(module: 'commons-logging')
exclude(module: 'junit')
}
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:'5.2.1.Final') {
testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:hibernateValidatorVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'jboss-logging')
exclude(module: 'xml-apis')
}
testCompile(group: 'com.ryantenney.metrics', name: 'metrics-spring', version:'3.1.2') {
testCompile(group: 'com.ryantenney.metrics', name: 'metrics-spring', version:dropwizardMetricsVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'spring-core')
exclude(module: 'spring-aop')
exclude(module: 'spring-beans')
exclude(module: 'spring-context-support')
}
testCompile(group: 'org.hibernate', name: 'hibernate-entitymanager', version:'5.0.0.Final') {
testCompile(group: 'org.hibernate', name: 'hibernate-entitymanager', version:hibernateVersion) {
exclude(module: 'javassist')
exclude(module: 'xml-apis')
}
testCompile group: 'javassist', name: 'javassist', version:'3.12.1.GA'
testCompile(group: 'org.jasig.inspektr', name: 'inspektr-support-spring', version:'1.2.GA') {
testCompile group: 'javassist', name: 'javassist', version:javassistVersion
testCompile(group: 'org.jasig.inspektr', name: 'inspektr-support-spring', version:inspektrVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'spring-web')
exclude(module: 'spring-webmvc')
Expand Down
4 changes: 2 additions & 2 deletions cas-server-extension-clearpass/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ dependencies {
compile project(':cas-server-core-api')
compile project(':cas-server-core-util')
compile project(':cas-server-core-tickets')
compile(group: 'net.sf.ehcache', name: 'ehcache', version:'2.10.0') {
compile(group: 'net.sf.ehcache', name: 'ehcache', version:ehcacheVersion) {
exclude(module: 'slf4j-api')
}
compile(group: 'org.jasig.cas.client', name: 'cas-client-core', version:'3.4.1') {
compile(group: 'org.jasig.cas.client', name: 'cas-client-core', version:casClientVersion) {
exclude(module: 'servlet-api')
exclude(module: 'log4j-over-slf4j')
exclude(module: 'bcprov-jdk15')
Expand Down
4 changes: 2 additions & 2 deletions cas-server-integration-ehcache/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

description = 'Apereo CAS Ehcache Integration'
dependencies {
compile(group: 'net.sf.ehcache', name: 'ehcache', version:'2.10.0') {
compile(group: 'net.sf.ehcache', name: 'ehcache', version:ehcacheVersion) {
exclude(module: 'slf4j-api')
}
compile project(':cas-server-core-api')
compile project(':cas-server-core-tickets')
compile(group: 'org.ehcache', name: 'jcache', version:'1.0.0') {
compile(group: 'org.ehcache', name: 'jcache', version:jcacheVersion) {
exclude(module: 'slf4j-api')
exclude(module: 'ehcache')
}
Expand Down
2 changes: 1 addition & 1 deletion cas-server-integration-hazelcast/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = 'Apereo CAS Hazelcast Integration'
dependencies {
compile project(':cas-server-core-api')
compile project(':cas-server-core-tickets')
compile group: 'com.hazelcast', name: 'hazelcast', version:'3.5.2'
compile group: 'com.hazelcast', name: 'hazelcast', version:hazelcastVersion
testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
testCompile project(':cas-server-core-util')
testCompile project(':cas-server-core-services')
Expand Down
Loading

0 comments on commit bbe09d5

Please sign in to comment.