You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by gi...@apache.org on 2022/12/21 17:49:25 UTC
[shiro] branch dependabot/maven/1.11.x/org.codehaus.groovy-groovy-3.0.13 updated (e27c9547 -> 4f3f11ec)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/1.11.x/org.codehaus.groovy-groovy-3.0.13
in repository https://gitbox.apache.org/repos/asf/shiro.git
discard e27c9547 Bump groovy from 2.5.18 to 3.0.13
add f947fb76 Bump mockito-core from 4.8.0 to 4.9.0
add 2cada070 Merge pull request #541 from apache/dependabot/maven/1.11.x/org.mockito-mockito-core-4.9.0
add 0d29d7dd [SHIRO-899] Added HttpSessionContext shim for Jakarta 9+ (Jakarta namespace)
add 947193be Merge pull request #555 from lprimak/add-http-session-ctx-shim
add 8ec5b4a5 [SHIRO-899] moved the HttpSessionContext Jakarta shim into Shiro package and out of jakarta package, to made JPMS work, and avoid split package issues
add bb30889b removed extraneous whitespace from pom.xml
add a7de2974 Merge pull request #558 from lprimak/native-sessions-jakarta-modular-1.11.x
add 4edaf476 [SHIRO-889] Provide Jakarta jar modules
add ef9636da [SHIRO-899] Added HttpSessionContext shim for Jakarta 9+ (Jakarta namespace)
add 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
add 7dcf8a6f [SHIRO-889] Removed Jakarta Crypto relocation - non-existent module
add 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
add e9f672a8 Merge pull request #566 from lprimak/shiro-889-jakarta-modules-shiro1
add c6573382 Bump dependency-check-maven from 7.2.1 to 7.4.1
add c8e2ddc3 Merge pull request #564 from apache/dependabot/maven/1.11.x/org.owasp-dependency-check-maven-7.4.1
add 740a54b7 Bump spring-boot.version from 2.7.4 to 2.7.5
add 6ee22af6 Merge pull request #534 from apache/dependabot/maven/1.11.x/spring-boot.version-2.7.5
add a6693c6b Bump maven-surefire-report-plugin from 3.0.0-M5 to 3.0.0-M7
add 421fc89f Merge pull request #538 from apache/dependabot/maven/1.11.x/org.apache.maven.plugins-maven-surefire-report-plugin-3.0.0-M7
add a24178b7 Bump hibernate.version from 5.6.12.Final to 5.6.14.Final
add b39d07ac Merge pull request #544 from apache/dependabot/maven/1.11.x/hibernate.version-5.6.14.Final
add 5981cd5b Bump gmavenplus-plugin from 1.13.1 to 2.1.0
add d16211de Merge pull request #535 from apache/dependabot/maven/1.11.x/org.codehaus.gmavenplus-gmavenplus-plugin-2.1.0
add 4f3f11ec Bump groovy from 2.5.18 to 3.0.13
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e27c9547)
\
N -- N -- N refs/heads/dependabot/maven/1.11.x/org.codehaus.groovy-groovy-3.0.13 (4f3f11ec)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
{integration-tests/jaxrs => bom}/pom.xml | 54 ++++---
core/pom.xml | 4 +
crypto/cipher/pom.xml | 4 +
pom.xml | 81 +++++++++--
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-boot/pom.xml | 2 +-
support/spring/pom.xml | 4 +
web/pom.xml | 4 +
.../{package-info.java => HttpSessionContext.java} | 12 +-
27 files changed, 449 insertions(+), 68 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%)
copy web/src/main/java/org/apache/shiro/web/servlet/{package-info.java => HttpSessionContext.java} (84%)