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 480f846b6 erge branch 'main' into 3.x
new 42892de73 chore: remove BOM module and added web-jakarta
new 76d392685 chore: moved web-jakarta back to web/
new f358d6dbd web-jakarta removal odds and dends
new b0e5a6a9d chore: enabled servlet-plugin but ITs do not yet run, so
they remain disabled
The 4 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:
bom/pom.xml | 120 -------------
pom.xml | 1 -
samples/pom.xml | 5 +-
samples/servlet-plugin/pom.xml | 42 ++---
samples/web-jakarta/pom.xml | 198 ---------------------
.../web-jakarta/src/main/resources/META-INF/NOTICE | 15 --
samples/web-jakarta/src/main/resources/log4j2.xml | 71 --------
.../web-jakarta/src/main/webapp/WEB-INF/shiro.ini | 62 -------
.../web-jakarta/src/main/webapp/WEB-INF/web.xml | 43 -----
.../web-jakarta/src/main/webapp/account/index.jsp | 36 ----
samples/web-jakarta/src/main/webapp/home.jsp | 69 -------
samples/web-jakarta/src/main/webapp/include.jsp | 22 ---
samples/web-jakarta/src/main/webapp/index.jsp | 21 ---
samples/web-jakarta/src/main/webapp/login.jsp | 110 ------------
samples/web-jakarta/src/main/webapp/logout.jsp | 34 ----
samples/web-jakarta/src/main/webapp/style.css | 47 -----
samples/web/README.md | 17 --
samples/web/pom.xml | 194 ++++++++++++--------
.../shiro/test/WebAppContainerIntegrationIT.java | 59 ------
.../web/jakarta/JakartaAbstractContainerIT.java | 0
.../shiro/test/web/jakarta/WebContainerIT.java | 5 +-
.../src/test/resources/log4j2.xml | 0
22 files changed, 138 insertions(+), 1033 deletions(-)
delete mode 100644 bom/pom.xml
delete mode 100644 samples/web-jakarta/pom.xml
delete mode 100644 samples/web-jakarta/src/main/resources/META-INF/NOTICE
delete mode 100644 samples/web-jakarta/src/main/resources/log4j2.xml
delete mode 100644 samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini
delete mode 100644 samples/web-jakarta/src/main/webapp/WEB-INF/web.xml
delete mode 100644 samples/web-jakarta/src/main/webapp/account/index.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/home.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/include.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/index.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/login.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/logout.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/style.css
delete mode 100644 samples/web/README.md
delete mode 100644
samples/web/src/test/java/org/apache/shiro/test/WebAppContainerIntegrationIT.java
rename samples/{web-jakarta =>
web}/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java
(100%)
rename samples/{web-jakarta =>
web}/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java (92%)
rename samples/{web-jakarta => web}/src/test/resources/log4j2.xml (100%)
