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 2023/01/26 06:19:15 UTC
[shiro] branch dependabot/maven/aspectj.version-1.9.19 updated (df2118db -> ffab5020)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/aspectj.version-1.9.19
in repository https://gitbox.apache.org/repos/asf/shiro.git
discard df2118db Bump aspectj.version from 1.9.7.M3 to 1.9.19
add 244c7031 Bump actions/checkout from 3.2.0 to 3.3.0
add 8fab24a4 Merge pull request #630 from apache/dependabot/github_actions/actions/checkout-3.3.0
add 1bfd6081 Bump easymock from 4.3 to 5.1.0
add 0c59b8a9 Merge pull request #627 from apache/dependabot/maven/org.easymock-easymock-5.1.0
add ce0eeaef [SHIRO-889] Jakarta JAR for shiro-spring-boot-starter module
add 4aa4db5c Merge pull request #632 from lucasdillmann/main
add 7b6f5f68 [SHIRO-900] Refactor and update pom.xml
add e3c56b52 Merge pull request #574 from lprimak/jdk11-improvements
add c0966bbd Name the authorizationCachingEnabled flag correctly
add 2ab2442f Merge pull request #629 from mnd999/mnd999-name-authorizingrealm-cache-flag
add d0ca4a5f Bump hibernate.version from 5.6.12.Final to 5.6.14.Final
add 0102f134 Merge pull request #623 from apache/dependabot/maven/hibernate.version-5.6.14.Final
add 65e6c981 Add Spring EnvironmentPostProcessor
add ced1f380 Bump dependency-check-maven from 7.2.1 to 8.0.0
add c6a70029 Merge pull request #644 from apache/dependabot/maven/org.owasp-dependency-check-maven-8.0.0
add 3c64f53a [SHIRO-904] update minimum to jdk 11
add 84fc8828 Merge pull request #657 from lprimak/jdk-11-minimum
add d0432fc0 [SHIRO-898] addad Jakarta EE integration
add 7b4604ce Merge pull request #563 from lprimak/jakartaee-integration
add 474a8328 Bump maven-dependency-plugin from 3.4.0 to 3.5.0
add 3cea9eaf Merge pull request #647 from apache/dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.5.0
add 73b47f5d do not pass GH credentials on Windows, was failing the builds
add 33a010f3 separated out Payara temp direcotires per-workspace so they don't clash on Jenkins
add 75d90fbc skip integration tests when deploying from Jenkins in addition to skipping regular tests
add 495350b2 Bump junit.version from 5.9.1 to 5.9.2
add eac02ca7 Merge pull request #659 from apache/dependabot/maven/junit.version-5.9.2
add 75f118db fixed jacoco coverage
add 53eb74bc Bump groovy.version from 4.0.7 to 4.0.8
add 11044e04 Merge pull request #666 from apache/dependabot/maven/groovy.version-4.0.8
add faf9220a saving payara logs and making it easier to find out why integration test failed
add 3caff397 Merge pull request #667 from lprimak/jakarta-ee-logging-enh
add bdbbb98c Bump japicmp-maven-plugin from 0.16.0 to 0.17.1
add ed7d1b1b Merge pull request #641 from apache/dependabot/maven/com.github.siom79.japicmp-japicmp-maven-plugin-0.17.1
add eeb70924 Bump hazelcast from 5.1.3 to 5.2.1
add d3e0cb97 Merge pull request #640 from apache/dependabot/maven/com.hazelcast-hazelcast-5.2.1
add cbfdeae6 Bump hsqldb from 2.5.0 to 2.7.1
add 344a0699 Merge pull request #548 from apache/dependabot/maven/org.hsqldb-hsqldb-2.7.1
add ffab5020 Bump aspectj.version from 1.9.7.M3 to 1.9.19
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 (df2118db)
\
N -- N -- N refs/heads/dependabot/maven/aspectj.version-1.9.19 (ffab5020)
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:
.github/workflows/maven.yml | 43 +-
.gitignore | 6 +
.jenkins.groovy | 8 +-
.../org/apache/shiro/realm/AuthorizingRealm.java | 8 +-
.../org/apache/shiro/subject/PrincipalMap.java | 1 -
.../apache/shiro/subject/SimplePrincipalMap.java | 1 -
.../jakarta-ee-support}/pom.xml | 37 +-
integration-tests/jakarta-ee/pom.xml | 490 ++++++++++++++++++++
.../apache/shiro/testing/jakarta/ee/FormBean.java | 49 ++
.../jakarta/ee/ProtectedFacesViewScopedBean.java | 54 +++
.../jakarta/ee/ProtectedOmniViewScopedBean.java | 54 +++
.../testing/jakarta/ee/ProtectedOneMethod.java | 32 ++
.../jakarta/ee/ProtectedSessionScopedBean.java | 52 +++
.../testing/jakarta/ee/ProtectedStatelessBean.java | 28 ++
.../testing/jakarta/ee/StatisticsResource.java | 62 +++
.../testing/jakarta/ee/UnprotectedFacade.java | 112 +++++
.../shiro/testing/jakarta/ee/UseFallback.java | 27 ++
.../jakarta/ee/servlets/ExceptionServlet.java | 51 ++
.../ee/servlets/InvalidateSessionServlet.java | 34 ++
.../testing/jakarta/ee/servlets/LogoutServlet.java | 35 ++
.../testing/jakarta/ee/servlets/RestConfig.java | 25 +
.../shiro/testing/logcapture/LogCapture.java | 91 ++++
.../testing/logcapture/LogCaptureSingleton.java | 36 ++
.../resources/META-INF/shiro-native-sessions.ini | 9 +-
.../src/main/resources/META-INF/shiro.ini | 75 +++
.../WEB-INF/errorpages/invalidErrorPage.xhtml | 45 ++
.../src/main/webapp/WEB-INF/faces-config.xml | 34 ++
.../src/main/webapp/WEB-INF/payara-web.xml | 15 +-
.../jakarta-ee/src/main/webapp/WEB-INF/web.xml | 76 +++
.../jakarta-ee/src/main/webapp/index.xhtml | 20 +-
.../src/main/webapp/shiro/adminpage.xhtml} | 22 +-
.../src/main/webapp/shiro/auth/loginform.xhtml | 51 ++
.../main/webapp/shiro/auth/unauthenticated.xhtml | 19 +-
.../src/main/webapp/shiro/auth/unauthorized.xhtml} | 22 +-
.../jakarta-ee/src/main/webapp/shiro/form.xhtml | 63 +++
.../src/main/webapp/shiro/index.xhtml} | 25 +-
.../src/main/webapp/shiro/protected.xhtml} | 25 +-
.../main/webapp/shiro/unprotected/manybeans.xhtml | 69 +++
.../shiro/testing/jakarta/ee/Deployments.java | 37 ++
.../shiro/testing/jakarta/ee/ShiroAuthFormsIT.java | 378 +++++++++++++++
.../shiro/testing/jakarta/ee/ShiroBeansIT.java | 186 ++++++++
.../shiro/testing/jakarta/ee/ShiroSSLFilterIT.java | 63 +++
.../jakarta-ee/src/test/resources/arquillian.xml | 40 ++
integration-tests/pom.xml | 3 +-
.../java/org/apache/shiro/lang/util/Assert.java | 4 -
pom.xml | 221 ++++++---
samples/web-jakarta/pom.xml | 1 +
src/checkstyle.xml | 318 +++++++++++++
src/suppressions.xml | 27 ++
support/jakarta-ee/README.adoc | 30 ++
support/{guice => jakarta-ee}/pom.xml | 144 +++---
.../apache/shiro/ee/cdi/AnnotatedTypeWrapper.java | 73 +++
.../java/org/apache/shiro/ee/cdi/AopHelper.java | 147 ++++++
.../main/java/org/apache/shiro/ee/cdi/KeyGen.java | 49 ++
.../apache/shiro/ee/cdi/ShiroFacesViewScoped.java | 31 ++
.../apache/shiro/ee/cdi/ShiroOmniViewScoped.java | 31 ++
.../org/apache/shiro/ee/cdi/ShiroScopeContext.java | 127 +++++
.../apache/shiro/ee/cdi/ShiroSecureAnnotation.java | 32 ++
.../shiro/ee/cdi/ShiroSecurityExtension.java | 39 ++
.../shiro/ee/cdi/ShiroSecurityInterceptor.java | 44 ++
.../shiro/ee/cdi/ShiroSessionScopeExtension.java | 120 +++++
.../apache/shiro/ee/cdi/ShiroSessionScoped.java | 29 ++
.../ee/filters/AuthenticationFilterDelegate.java | 147 ++++++
.../shiro/ee/filters/FormAuthenticationFilter.java | 96 ++++
.../shiro/ee/filters/FormResubmitSupport.java | 515 +++++++++++++++++++++
.../ee/filters/FormResubmitSupportCookies.java | 84 ++++
.../java/org/apache/shiro/ee/filters/Forms.java | 215 +++++++++
.../org/apache/shiro/ee/filters/LogoutFilter.java | 84 ++++
.../ee/filters/PassThruAuthenticationFilter.java | 70 +++
.../org/apache/shiro/ee/filters/ShiroFilter.java | 243 ++++++++++
.../org/apache/shiro/ee/filters/SslFilter.java | 54 +++
.../ee/listeners/EnvironmentLoaderListener.java | 64 +++
.../apache/shiro/ee/listeners/IniEnvironment.java | 75 +++
.../apache/shiro/ee/util/JakartaTransformer.java | 37 ++
.../src/main/resources/META-INF/beans.xml | 11 +-
.../services/javax.enterprise.inject.spi.Extension | 19 +
.../shiro/ee/cdi/AnnotatedTypeWrapperTest.java | 148 ++++++
.../org/apache/shiro/ee/cdi/AopHelperTest.java | 91 ++++
.../apache/shiro/ee/cdi/ShiroScopeContextTest.java | 122 +++++
.../apache/shiro/ee/filters/FormSupportTest.java | 156 +++++++
support/pom.xml | 3 +-
support/spring-boot/spring-boot-starter/pom.xml | 8 +
.../ShiroEnvironmentPostProcessor.java | 35 +-
.../src/main/resources/META-INF/spring.factories | 5 +-
.../shiro/web/servlet/HttpSessionContext.java | 2 -
85 files changed, 6091 insertions(+), 273 deletions(-)
copy {tools => integration-tests/jakarta-ee-support}/pom.xml (57%)
create mode 100644 integration-tests/jakarta-ee/pom.xml
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/FormBean.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedFacesViewScopedBean.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedOmniViewScopedBean.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedOneMethod.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedSessionScopedBean.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedStatelessBean.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/StatisticsResource.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/UnprotectedFacade.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/UseFallback.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/servlets/ExceptionServlet.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/servlets/InvalidateSessionServlet.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/servlets/LogoutServlet.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/servlets/RestConfig.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/logcapture/LogCapture.java
create mode 100644 integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/logcapture/LogCaptureSingleton.java
copy web/src/test/resources/EmptyShiroIni.ini => integration-tests/jakarta-ee/src/main/resources/META-INF/shiro-native-sessions.ini (77%)
create mode 100644 integration-tests/jakarta-ee/src/main/resources/META-INF/shiro.ini
create mode 100644 integration-tests/jakarta-ee/src/main/webapp/WEB-INF/errorpages/invalidErrorPage.xhtml
create mode 100644 integration-tests/jakarta-ee/src/main/webapp/WEB-INF/faces-config.xml
copy support/aspectj/src/test/resources/META-INF/aop.xml => integration-tests/jakarta-ee/src/main/webapp/WEB-INF/payara-web.xml (75%)
create mode 100644 integration-tests/jakarta-ee/src/main/webapp/WEB-INF/web.xml
copy support/aspectj/src/test/resources/META-INF/aop.xml => integration-tests/jakarta-ee/src/main/webapp/index.xhtml (75%)
copy integration-tests/{jaxrs/app/src/main/resources/META-INF/beans.xml => jakarta-ee/src/main/webapp/shiro/adminpage.xhtml} (68%)
create mode 100644 integration-tests/jakarta-ee/src/main/webapp/shiro/auth/loginform.xhtml
copy support/aspectj/src/test/resources/META-INF/aop.xml => integration-tests/jakarta-ee/src/main/webapp/shiro/auth/unauthenticated.xhtml (77%)
copy integration-tests/{jaxrs/app/src/main/resources/META-INF/beans.xml => jakarta-ee/src/main/webapp/shiro/auth/unauthorized.xhtml} (68%)
create mode 100644 integration-tests/jakarta-ee/src/main/webapp/shiro/form.xhtml
copy integration-tests/{jaxrs/app/src/main/resources/META-INF/beans.xml => jakarta-ee/src/main/webapp/shiro/index.xhtml} (63%)
copy integration-tests/{jaxrs/app/src/main/resources/META-INF/beans.xml => jakarta-ee/src/main/webapp/shiro/protected.xhtml} (62%)
create mode 100644 integration-tests/jakarta-ee/src/main/webapp/shiro/unprotected/manybeans.xhtml
create mode 100644 integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/Deployments.java
create mode 100644 integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/ShiroAuthFormsIT.java
create mode 100644 integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/ShiroBeansIT.java
create mode 100644 integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/ShiroSSLFilterIT.java
create mode 100644 integration-tests/jakarta-ee/src/test/resources/arquillian.xml
create mode 100644 src/checkstyle.xml
create mode 100644 src/suppressions.xml
create mode 100644 support/jakarta-ee/README.adoc
copy support/{guice => jakarta-ee}/pom.xml (50%)
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/AnnotatedTypeWrapper.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/AopHelper.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/KeyGen.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroFacesViewScoped.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroOmniViewScoped.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroScopeContext.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroSecureAnnotation.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroSecurityExtension.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroSecurityInterceptor.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroSessionScopeExtension.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/cdi/ShiroSessionScoped.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/AuthenticationFilterDelegate.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormAuthenticationFilter.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupport.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupportCookies.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/Forms.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/LogoutFilter.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/PassThruAuthenticationFilter.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/ShiroFilter.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/SslFilter.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/EnvironmentLoaderListener.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/IniEnvironment.java
create mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/util/JakartaTransformer.java
copy {integration-tests/jaxrs/app => support/jakarta-ee}/src/main/resources/META-INF/beans.xml (74%)
create mode 100644 support/jakarta-ee/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
create mode 100644 support/jakarta-ee/src/test/java/org/apache/shiro/ee/cdi/AnnotatedTypeWrapperTest.java
create mode 100644 support/jakarta-ee/src/test/java/org/apache/shiro/ee/cdi/AopHelperTest.java
create mode 100644 support/jakarta-ee/src/test/java/org/apache/shiro/ee/cdi/ShiroScopeContextTest.java
create mode 100644 support/jakarta-ee/src/test/java/org/apache/shiro/ee/filters/FormSupportTest.java
copy event/src/test/groovy/org/apache/shiro/event/support/SubclassTestSubscriber.groovy => support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroEnvironmentPostProcessor.java (53%)