This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a change to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
from e6e500c4a enh: added spring-mvc module
new 58d3f20d2 added spring-hibernate example
new b988f57f9 fixed deferred profile
add 8dc0d8140 [dependency] Upgrade to Apache POM 37
new 3719409ce Merge branch 'main' into 3.x
new ad926dc8f added spring-boot sample
new da7b0e894 added back spring-boot-web
new 328817ff9 spring-sample: fixed logging
new 0e99b33b4 removed most Spring PostBootProcessor warnings
new 3cc57d3ac fixed spring boot fixes #1236
new d193afe82 fixed up jacoco skipping
new 99228dd77 removed generated groovy stubs
new d2aee92f3 add cglib to jacoco exclusions
new 990011335 enh: added flowlogix releases
The 12 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:
.mvn/maven.config | 2 +-
.../crypto/support/hashes/bcrypt/BCryptHash.java | 3 +-
integration-tests/guice/pom.xml | 29 +---
integration-tests/support/pom.xml | 12 +-
.../shiro/testing/web/AbstractContainerIT.java | 2 +-
pom.xml | 45 +++---
samples/guice/pom.xml | 28 +---
samples/pom.xml | 16 +-
samples/servlet-plugin/pom.xml | 45 +-----
samples/spring-boot-3-web/README.md | 18 ---
samples/spring-boot-3-web/pom.xml | 165 ---------------------
.../shiro/samples/AccountInfoController.java | 52 -------
.../org/apache/shiro/samples/HelloController.java | 61 --------
.../org/apache/shiro/samples/LoginController.java | 34 -----
.../shiro/samples/RestrictedErrorController.java | 57 -------
.../main/java/org/apache/shiro/samples/WebApp.java | 98 ------------
.../src/main/resources/META-INF/NOTICE | 15 --
.../src/main/resources/application.properties | 26 ----
.../src/main/resources/templates/account-info.html | 39 -----
.../src/main/resources/templates/error.html | 39 -----
.../main/resources/templates/fragments/head.html | 58 --------
.../src/main/resources/templates/hello.html | 45 ------
.../src/main/resources/templates/login.html | 93 ------------
samples/spring-boot-web/README.md | 5 +-
samples/spring-boot-web/pom.xml | 78 +++++-----
.../org/apache/shiro/samples/HelloController.java | 4 +-
.../shiro/samples/RestrictedErrorController.java | 12 +-
.../main/java/org/apache/shiro/samples/WebApp.java | 4 +
.../src/main/resources/log4j2.properties | 0
.../src/main/resources/templates/account-info.html | 2 +-
.../src/main/resources/templates/error.html | 4 +-
.../src/main/resources/templates/hello.html | 2 +-
.../src/main/resources/templates/login.html | 2 +-
samples/spring-boot/pom.xml | 38 +----
samples/spring-hibernate/pom.xml | 35 ++++-
.../samples/sprhib/dao/BootstrapDataPopulator.java | 11 --
.../shiro/samples/sprhib/dao/HibernateDao.java | 19 +--
.../shiro/samples/sprhib/dao/HibernateUserDAO.java | 6 +-
.../apache/shiro/samples/sprhib/model/Role.java | 3 +-
.../apache/shiro/samples/sprhib/model/User.java | 5 +-
.../samples/sprhib/web/EditUserValidator.java | 2 +-
.../shiro/samples/sprhib/web/LoginValidator.java | 2 +-
.../shiro/samples/sprhib/web/SignupValidator.java | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 36 ++---
.../src/main/webapp/WEB-INF/web.xml | 10 --
samples/spring-mvc/pom.xml | 1 -
samples/spring/pom.xml | 5 +
samples/web/pom.xml | 2 -
support/jakarta-ee/pom.xml | 1 -
support/pom.xml | 11 +-
.../ShiroAnnotationProcessorAutoConfiguration.java | 6 +-
.../autoconfigure/ShiroBeanAutoConfiguration.java | 20 ++-
.../ShiroEnvironmentPostProcessor.java | 9 +-
.../spring/ShiroEventBusBeanPostProcessor.java | 12 +-
...tractShiroAnnotationProcessorConfiguration.java | 6 -
.../config/AbstractShiroBeanConfiguration.java | 42 ------
.../ShiroAnnotationProcessorConfiguration.java | 5 +-
.../spring/config/ShiroBeanConfiguration.java | 20 ++-
.../shiro/spring/web/ShiroFilterFactoryBean.java | 39 +----
.../web/ShiroFilterFactoryBeanPostProcessor.java | 70 +++++++++
.../web/config/ShiroWebFilterConfiguration.java | 7 +-
.../spring/web/ShiroFilterFactoryBeanTest.xml | 3 +
62 files changed, 320 insertions(+), 1203 deletions(-)
delete mode 100644 samples/spring-boot-3-web/README.md
delete mode 100644 samples/spring-boot-3-web/pom.xml
delete mode 100644
samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/AccountInfoController.java
delete mode 100644
samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/HelloController.java
delete mode 100644
samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/LoginController.java
delete mode 100644
samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/RestrictedErrorController.java
delete mode 100644
samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/WebApp.java
delete mode 100644 samples/spring-boot-3-web/src/main/resources/META-INF/NOTICE
delete mode 100644
samples/spring-boot-3-web/src/main/resources/application.properties
delete mode 100644
samples/spring-boot-3-web/src/main/resources/templates/account-info.html
delete mode 100644
samples/spring-boot-3-web/src/main/resources/templates/error.html
delete mode 100644
samples/spring-boot-3-web/src/main/resources/templates/fragments/head.html
delete mode 100644
samples/spring-boot-3-web/src/main/resources/templates/hello.html
delete mode 100644
samples/spring-boot-3-web/src/main/resources/templates/login.html
rename samples/{spring-boot-3-web =>
spring-boot-web}/src/main/resources/log4j2.properties (100%)
delete mode 100644
support/spring/src/main/java/org/apache/shiro/spring/config/AbstractShiroBeanConfiguration.java
create mode 100644
support/spring/src/main/java/org/apache/shiro/spring/web/ShiroFilterFactoryBeanPostProcessor.java
