You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2020/11/10 16:23:02 UTC

[shiro] branch master updated (04a5eee -> c0ff831)

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 04a5eee  Merge pull request #264 from coheigea/jetty-9.4.34
     add 1b9d8d9  hotfix springboot spring.factories
     add bd152ba  Add basic tests to assert no whitespace in spring.factories fiels
     add 9a2de16  Add missing license headers to new tests
     new c0ff831  Merge pull request #263 from dngzs/hotfix/springboot_autoconfig

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:
 .../boot/autoconfigure/SpringFactoriesTest.groovy  | 32 +++++++++-------------
 .../src/main/resources/META-INF/spring.factories   |  2 +-
 .../web/WebSpringFactoriesTest.groovy              | 32 +++++++++-------------
 3 files changed, 27 insertions(+), 39 deletions(-)
 copy event/src/test/groovy/org/apache/shiro/event/EventTest.groovy => support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/SpringFactoriesTest.groovy (54%)
 copy event/src/test/groovy/org/apache/shiro/event/EventTest.groovy => support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/WebSpringFactoriesTest.groovy (54%)


[shiro] 01/01: Merge pull request #263 from dngzs/hotfix/springboot_autoconfig

Posted by 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 c0ff831eec9c1fd9674f1076b578104c249c2558
Merge: 04a5eee 9a2de16
Author: François Papon <fp...@apache.org>
AuthorDate: Tue Nov 10 17:09:21 2020 +0100

    Merge pull request #263 from dngzs/hotfix/springboot_autoconfig
    
    [SHIRO-797] Shiro 1.7.0 is lower than using springboot version 2.0.7 dependency error

 .../boot/autoconfigure/SpringFactoriesTest.groovy  | 42 ++++++++++++++++++++++
 .../src/main/resources/META-INF/spring.factories   |  2 +-
 .../web/WebSpringFactoriesTest.groovy              | 42 ++++++++++++++++++++++
 3 files changed, 85 insertions(+), 1 deletion(-)