You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lp...@apache.org on 2022/12/12 15:07:20 UTC
[shiro] branch 1.11.x updated (a7de2974 -> e9f672a8)
This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a change to branch 1.11.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
from a7de2974 Merge pull request #558 from lprimak/native-sessions-jakarta-modular-1.11.x
new 4edaf476 [SHIRO-889] Provide Jakarta jar modules
new ef9636da [SHIRO-899] Added HttpSessionContext shim for Jakarta 9+ (Jakarta namespace)
new 1e9d8906 [SHIRO-899] moved the HttpSessionContext Jakarta shim into Shiro package and out of jakarta package, to made JPMS work, and avoid split package issues
new 7dcf8a6f [SHIRO-889] Removed Jakarta Crypto relocation - non-existent module
new f2862697 [SHIRO-889] fix samples POM parent version for 1.11, CXF xml merge commit cruft, fixed and converted Jupiter tests back to classic JUnit
new e9f672a8 Merge pull request #566 from lprimak/shiro-889-jakarta-modules-shiro1
The 2244 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:
{integration-tests/jaxrs => bom}/pom.xml | 54 ++++---
core/pom.xml | 4 +
crypto/cipher/pom.xml | 4 +
pom.xml | 65 +++++++++
samples/jaxrs/src/main/webapp/WEB-INF/web.cxf.xml | 8 --
samples/pom.xml | 2 +-
samples/web-jakarta/pom.xml | 157 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 0
.../src/main/resources/log4j2.xml | 0
.../src/main/webapp/WEB-INF/shiro.ini | 0
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../src/main/webapp/account/index.jsp | 2 +-
.../{web => web-jakarta}/src/main/webapp/home.jsp | 0
.../web-jakarta}/src/main/webapp/include.jsp | 2 +-
.../src/main/webapp/index.jsp | 2 +-
.../web-jakarta}/src/main/webapp/login.jsp | 0
.../src/main/webapp/logout.jsp | 0
.../web-jakarta}/src/main/webapp/style.css | 2 +-
.../web/jakarta/JakartaAbstractContainerIT.java | 70 +++++++++
.../shiro/test/web/jakarta/WebContainerTest.java | 74 ++++++++++
.../src/test}/resources/log4j2.xml | 21 +--
support/guice/pom.xml | 4 +
support/jaxrs/pom.xml | 4 +
support/spring/pom.xml | 4 +
web/pom.xml | 4 +
25 files changed, 431 insertions(+), 56 deletions(-)
copy {integration-tests/jaxrs => bom}/pom.xml (50%)
create mode 100644 samples/web-jakarta/pom.xml
copy {cache => samples/web-jakarta}/src/main/resources/META-INF/NOTICE (100%)
copy samples/{web => web-jakarta}/src/main/resources/log4j2.xml (100%)
copy samples/{web => web-jakarta}/src/main/webapp/WEB-INF/shiro.ini (100%)
copy samples/{web => web-jakarta}/src/main/webapp/WEB-INF/web.xml (95%)
copy samples/{web => web-jakarta}/src/main/webapp/account/index.jsp (99%)
copy samples/{web => web-jakarta}/src/main/webapp/home.jsp (100%)
copy {integration-tests/guice4 => samples/web-jakarta}/src/main/webapp/include.jsp (94%)
copy samples/{guice => web-jakarta}/src/main/webapp/index.jsp (96%)
copy {integration-tests/guice3 => samples/web-jakarta}/src/main/webapp/login.jsp (100%)
copy samples/{web => web-jakarta}/src/main/webapp/logout.jsp (100%)
copy {integration-tests/guice3 => samples/web-jakarta}/src/main/webapp/style.css (99%)
create mode 100644 samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java
create mode 100644 samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerTest.java
copy samples/{web/src/main => web-jakarta/src/test}/resources/log4j2.xml (68%)