[shiro] branch master updated (8e3042f -> d52b834)

[fp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git.


    from 8e3042f  Merge pull request #220 from bmhm/SHIRO-551
     add c276617  Fixed issue where no custom filters are defined in spring (non-boot) applications
     new d52b834  Merge pull request #244 from apache/spring-config-filter-fix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../web/config/AbstractShiroWebFilterConfiguration.java  |  7 +++++--
 ...ationTest.groovy => ShiroWebConfigurationTest.groovy} | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)
 copy support/spring/src/test/groovy/org/apache/shiro/spring/config/{ShiroConfigurationTest.groovy => ShiroWebConfigurationTest.groovy} (84%)

[shiro] 01/01: Merge pull request #244 from apache/spring-config-filter-fix

[fp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git

commit d52b834c08306a7965e47f8fd6976a945956f5b1
Merge: 8e3042f c276617
Author: François Papon <fp...@apache.org>
AuthorDate: Wed Jul 15 21:59:05 2020 +0200

    Merge pull request #244 from apache/spring-config-filter-fix
    
    [SHIRO-784] Fixed issue where no custom filters are defined in spring (non-boot) apps

 .../AbstractShiroWebFilterConfiguration.java       |  7 +-
 .../spring/config/ShiroWebConfigurationTest.groovy | 82 ++++++++++++++++++++++
 2 files changed, 87 insertions(+), 2 deletions(-)