diff --git a/acl/build.gradle b/acl/build.gradle index af8e7cbc78..63b9c38832 100644 --- a/acl/build.gradle +++ b/acl/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':core'), - 'net.sf.ehcache:ehcache:1.4.1', + "net.sf.ehcache:ehcache:$ehcacheVersion", "org.springframework:spring-context:$springVersion", "org.springframework:spring-core:$springVersion", "org.springframework:spring-tx:$springVersion", diff --git a/build.gradle b/build.gradle index cd61f82788..d95c0a9b22 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,8 @@ allprojects { subprojects { usePlugin 'java' - springVersion = '3.0.0.RC2' + springVersion = '3.0.0.RC3' + ehcacheVersion = '1.6.2' dependencies { compile 'commons-logging:commons-logging:1.1.1' diff --git a/cas/build.gradle b/cas/build.gradle new file mode 100644 index 0000000000..14119a5107 --- /dev/null +++ b/cas/build.gradle @@ -0,0 +1,13 @@ + +dependencies { + compile project(':core'), + project(':web'), + "javax.servlet:servlet-api:2.5", + "org.springframework:spring-core:$springVersion", + "org.springframework:spring-context:$springVersion", + "org.springframework:spring-beans:$springVersion", + "org.springframework:spring-tx:$springVersion", + "org.springframework:spring-web:$springVersion", + "org.jasig.cas:cas-client-core:3.1.9", + "net.sf.ehcache:ehcache:$ehcacheVersion" +} \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 1ce7a6470b..a11fd8440f 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -2,9 +2,7 @@ dependencies { compile 'aopalliance:aopalliance:1.0', - 'commons-codec:commons-codec:1.3', - 'jaxen:jaxen:1.1.1', - 'net.sf.ehcache:ehcache:1.4.1', + "net.sf.ehcache:ehcache:$ehcacheVersion", "org.springframework:spring-aop:$springVersion", "org.springframework:spring-beans:$springVersion", "org.springframework:spring-core:$springVersion", @@ -18,7 +16,6 @@ dependencies { 'org.apache.tomcat:annotations-api:6.0.14' runtime 'hsqldb:hsqldb:1.8.0.7' - //'asm:asm-all:2.2.3', testCompile 'commons-collections:commons-collections:3.2', "org.springframework:spring-test:$springVersion" diff --git a/settings.gradle b/settings.gradle index ab970e5339..6a13b13651 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'core', 'web', 'ldap', 'acl', 'config', 'openid' +include 'core', 'web', 'ldap', 'acl', 'config', 'cas', 'openid'