You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@shiro.apache.org by bm...@apache.org on 2023/06/24 20:35:18 UTC

[shiro] branch main updated (65e6ef46a -> 1a572eb65)

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

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


    from 65e6ef46a Merge pull request #948 from apache/#947_junit-jupiter
     add 3e3ed6be8 [#943] replace logback with log4j
     add d44354ca7 [#943] remove logback from hasher test
     add 97a815656 [#943] convert logback.xml to log4j2.xml
     add 1a572eb65 Merge pull request #945 from apache/#943_remove_logback

No new revisions were added by this update.

Summary of changes:
 pom.xml                                            |  6 ---
 samples/spring-boot/pom.xml                        |  9 ++++-
 tools/hasher/pom.xml                               | 14 ++++++-
 .../hasher/src/main/resources/log4j2.xml           |  9 ++---
 tools/hasher/src/main/resources/logback.xml        | 31 ---------------
 .../org/apache/shiro/tools/hasher/HasherTest.java  | 46 +++++++++++++---------
 tools/hasher/src/test/resources/logback-test.xml   | 28 -------------
 7 files changed, 49 insertions(+), 94 deletions(-)
 copy samples/aspectj/src/test/resources/log4j2-test.xml => tools/hasher/src/main/resources/log4j2.xml (85%)
 delete mode 100644 tools/hasher/src/main/resources/logback.xml
 delete mode 100644 tools/hasher/src/test/resources/logback-test.xml