Repository: aurora Updated Branches: refs/heads/master f94e5c271 -> 04b6858a0
Upgrade Shiro to 1.2.4. Testing Done: ./gradlew build -Pq Bugs closed: AURORA-1186 Reviewed at https://reviews.apache.org/r/37938/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/04b6858a Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/04b6858a Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/04b6858a Branch: refs/heads/master Commit: 04b6858a0a6f72855d5cf5fc7bc8663a7eeb41d6 Parents: f94e5c2 Author: Zameer Manji <[email protected]> Authored: Mon Aug 31 10:10:51 2015 -0700 Committer: Zameer Manji <[email protected]> Committed: Mon Aug 31 10:10:51 2015 -0700 ---------------------------------------------------------------------- build.gradle | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/04b6858a/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index ce99f3a..9c78aff 100644 --- a/build.gradle +++ b/build.gradle @@ -318,7 +318,7 @@ sourceSets { } dependencies { - def shiroRev = '1.2.3' + def shiroRev = '1.2.4' def gsonDep = "com.google.code.gson:gson:${gsonRev}" def guavaDep = "com.google.guava:guava:${guavaRev}" @@ -345,10 +345,7 @@ dependencies { compile "log4j:log4j:${log4jRev}" compile "org.antlr:stringtemplate:${stringTemplateRev}" compile 'org.apache.mesos:mesos:0.23.0' - compile("org.apache.shiro:shiro-guice:${shiroRev}") { - // TODO(ksweeney): Remove this exclusion when https://issues.apache.org/jira/browse/SHIRO-496 is resolved. - exclude group: 'com.google.guava' - } + compile("org.apache.shiro:shiro-guice:${shiroRev}") compile "org.apache.shiro:shiro-web:${shiroRev}" compile "org.apache.zookeeper:zookeeper:${zookeeperRev}" compile "org.eclipse.jetty:jetty-rewrite:${jettyDep}"
