[shiro] 01/06: Merge tag 'upstream/1.2.4'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository shiro.

commit 239c7dd47ba7f2c160a551d09555b4939ba60506
Merge: 9220908 c6cbd10
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 20 15:24:10 2015 +0200

    Merge tag 'upstream/1.2.4'
    
    Upstream version 1.2.4

 all/pom.xml                                        |   2 +-
 core/pom.xml                                       |   2 +-
 .../org/apache/shiro/realm/AuthorizingRealm.java   |   6 +-
 .../java/org/apache/shiro/util/ThreadContext.java  |  24 ++-
 pom.xml                                            |  43 +++--
 samples/aspectj/pom.xml                            |   2 +-
 samples/pom.xml                                    |   2 +-
 samples/quickstart/pom.xml                         |   2 +-
 samples/spring-client/pom.xml                      |   2 +-
 samples/spring-hibernate/pom.xml                   |   2 +-
 samples/spring/pom.xml                             |   2 +-
 samples/web/pom.xml                                |   2 +-
 support/aspectj/pom.xml                            |   2 +-
 support/cas/pom.xml                                | 178 +++++++++---------
 support/ehcache/pom.xml                            |   2 +-
 support/features/pom.xml                           | 196 ++++++++++----------
 support/guice/pom.xml                              | 194 ++++++++++----------
 .../org/apache/shiro/guice/BeanTypeListener.java   |  40 +++-
 .../java/org/apache/shiro/guice/ShiroModule.java   |  29 +--
 .../shiro/guice/web/AbstractInjectionProvider.java |  13 +-
 .../guice/web/FilterChainResolverProvider.java     |  17 +-
 .../org/apache/shiro/guice/web/ShiroWebModule.java |  53 +++---
 .../shiro/guice/web/SimpleFilterChainResolver.java |  38 ++--
 .../apache/shiro/guice/BeanTypeListenerTest.java   |  36 ++--
 .../guice/web/SimpleFilterChainResolverTest.java   |  31 ++--
 .../shiro/guice/web/SimpleFilterChainTest.java     |  17 +-
 support/pom.xml                                    |   2 +-
 support/quartz/pom.xml                             |   2 +-
 support/spring/pom.xml                             |   2 +-
 tools/hasher/pom.xml                               | 202 ++++++++++-----------
 tools/pom.xml                                      |  80 ++++----
 web/pom.xml                                        |   2 +-
 32 files changed, 662 insertions(+), 565 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/shiro.git