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 9092214fc Merge branch 'main' into 3.x
add 141de94aa chore(deps): bump org.apache:apache from 34 to 35
add 073bf165f Merge pull request #2148 from
apache/dependabot/maven/org.apache-apache-35
add 5dfcb3bbb chore(deps): bump log4j.version from 2.24.3 to 2.25.0
add 821fccd55 Merge pull request #2149 from
apache/dependabot/maven/log4j.version-2.25.0
add 300cc780b chore(deps): bump commons-beanutils:commons-beanutils
add ad93182eb Merge pull request #2150 from
apache/dependabot/maven/commons-beanutils-commons-beanutils-1.11.0
add c08d5ba65 chore(deps): bump groovy.version from 4.0.26 to 4.0.27
add 0e55a0256 Merge pull request #2151 from
apache/dependabot/maven/groovy.version-4.0.27
add 62da3a3db chore(deps-dev): bump org.apache.cxf:cxf-rt-frontend-jaxrs
add 66990deb7 Merge pull request #2153 from
apache/dependabot/maven/org.apache.cxf-cxf-rt-frontend-jaxrs-3.6.7
add 456d8daa8 chore(deps): bump org.apache.cxf:cxf-rt-rs-client from 3.6.6
to 3.6.7
add 8585eb2ba Merge pull request #2154 from
apache/dependabot/maven/org.apache.cxf-cxf-rt-rs-client-3.6.7
add fd653ac32 chore(deps): bump org.jsoup:jsoup from 1.20.1 to 1.21.1
add 98c9ed242 Merge pull request #2155 from
apache/dependabot/maven/org.jsoup-jsoup-1.21.1
add 18c58e506 chore(deps): bump com.puppycrawl.tools:checkstyle
add ef9ce51fc Merge pull request #2156 from
apache/dependabot/maven/com.puppycrawl.tools-checkstyle-10.25.1
add 1abf7b5ca chore(deps): bump com.puppycrawl.tools:checkstyle
add 69902f017 Merge pull request #2159 from
apache/dependabot/maven/com.puppycrawl.tools-checkstyle-10.26.0
add 19ac6b757 chore(deps-dev): bump junit.engine.version from 1.13.1 to
1.13.2
add 9408b797f Merge pull request #2157 from
apache/dependabot/maven/junit.engine.version-1.13.2
add 9e7714526 chore(deps): bump junit.version from 5.13.1 to 5.13.2
add a1cc4af64 Merge pull request #2158 from
apache/dependabot/maven/junit.version-5.13.2
add 9909ae6a1 chore(deps-dev): bump arquillian.core.version
add 83af650c4 Merge pull request #2161 from
apache/dependabot/maven/arquillian.core.version-1.10.0.Final
add ec7737976 chore(deps): bump github/codeql-action from 3.29.0 to 3.29.1
add 9dc2a6d1d Merge pull request #2162 from
apache/dependabot/github_actions/github/codeql-action-3.29.1
add 710f8f6ea chore(java): fix typos
add b92543535 Merge pull request #2163 from jbampton/fix-typos
add 1a0906925 chore(java): fix typos
add 48f94a88e Merge pull request #2164 from jbampton/more-typos
add 00b1b5edc chore(java): fix typos
add a6202cbcc Merge pull request #2165 from jbampton/fix-more-spelling
add dd6485c7f chore(deps): bump github/codeql-action from 3.29.1 to 3.29.2
add e969faee9 Merge pull request #2166 from
apache/dependabot/github_actions/github/codeql-action-3.29.2
add 166b22121 Fix spelling in `pom.xml`
add dcd429db4 Merge pull request #2168 from jbampton/fix-spelling
add cdbb1dc22 chore(deps): bump com.puppycrawl.tools:checkstyle
add 20f2c599b Merge pull request #2169 from
apache/dependabot/maven/com.puppycrawl.tools-checkstyle-10.26.1
add e616af13b chore(java): fix spelling
add f2b4e705e Merge pull request #2170 from jbampton/fix-typos
add d1a91d65f chore: remove unneeded trailing whitespace
add 725d9c9a1 Merge pull request #2171 from jbampton/whitespace-clean-up
add 8b5584bf0 chore(samples): fix spelling
add 1f042d0d4 Merge pull request #2172 from jbampton/fix-typos
add 05d75f407 chore(java): fix spelling
add 3d84c1bdf Merge pull request #2174 from jbampton/fix-typos
add 893164510 chore(samples): remove tabs from `pom.xml` files
add 88e0cb467 Merge pull request #2173 from
jbampton/fix-whitespace-remove-tabs
add e37ae5cc6 deps: updated maven wrapper version to 3.9.10
add b495c2c4b Merge pull request #2176 from lprimak/update-maven-version
new 0208ad282 Merge branch 'main' into 3.x
The 1 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:
.github/pull_request_template.md | 14 ++++-----
.github/workflows/codeql.yml | 4 +--
.github/workflows/scorecards.yml | 10 +++----
.mvn/wrapper/maven-wrapper.properties | 2 +-
CONTRIBUTING.md | 8 ++---
NOTICE | 6 ++--
README.md | 2 +-
cache/src/main/resources/META-INF/NOTICE | 6 ++--
config/core/src/main/resources/META-INF/NOTICE | 6 ++--
.../shiro/config/ogdl/ReflectionBuilder.java | 2 +-
config/ogdl/src/main/resources/META-INF/NOTICE | 6 ++--
.../activedirectory/ActiveDirectoryRealm.java | 4 +--
.../java/org/apache/shiro/realm/text/IniRealm.java | 2 +-
core/src/main/resources/META-INF/NOTICE | 6 ++--
.../shiro/test/SecurityManagerTestSupport.java | 2 +-
crypto/cipher/src/main/resources/META-INF/NOTICE | 6 ++--
crypto/core/src/main/resources/META-INF/NOTICE | 6 ++--
crypto/hash/pom.xml | 2 +-
crypto/hash/src/main/resources/META-INF/NOTICE | 4 +--
crypto/support/hashes/argon2/pom.xml | 6 ++--
crypto/support/hashes/bcrypt/pom.xml | 6 ++--
event/src/main/resources/META-INF/NOTICE | 6 ++--
integration-tests/jakarta-ee/pom.xml | 2 +-
.../shiro/testing/jakarta/ee/ShiroBeansIT.java | 6 ++--
integration-tests/jaxrs/tests/pom.xml | 2 +-
lang/src/main/resources/META-INF/NOTICE | 6 ++--
pom.xml | 16 +++++-----
samples/aspectj/pom.xml | 34 +++++++++++-----------
samples/aspectj/src/main/resources/META-INF/NOTICE | 6 ++--
.../aspectj/bank/SecureBankServiceTest.java | 10 +++----
.../src/test/resources/shiroBankServiceTest.ini | 6 ++--
samples/guice/src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../quickstart-guice/src/main/resources/shiro.ini | 2 +-
.../quickstart/src/main/resources/META-INF/NOTICE | 6 ++--
samples/quickstart/src/main/resources/shiro.ini | 2 +-
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../spring-boot/src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
samples/spring-mvc/pom.xml | 4 +--
.../spring-mvc/src/main/resources/META-INF/NOTICE | 6 ++--
samples/spring/pom.xml | 2 +-
samples/spring/src/main/resources/META-INF/NOTICE | 6 ++--
.../web-jakarta/src/main/resources/META-INF/NOTICE | 6 ++--
samples/web/src/main/resources/META-INF/NOTICE | 6 ++--
.../src/test/resources/shiroDummyServiceTest.ini | 2 +-
.../main/java/org/apache/shiro/cdi/AopHelper.java | 12 ++++----
support/guice/src/main/resources/META-INF/NOTICE | 2 +-
support/jakarta-ee/pom.xml | 2 +-
.../shiro/ee/faces/tags/HasAnyPermissionTag.java | 4 +--
.../apache/shiro/ee/faces/tags/HasAnyRolesTag.java | 6 ++--
.../shiro/ee/filters/FormResubmitSupport.java | 12 ++++----
support/jaxrs/pom.xml | 2 +-
support/jaxrs/src/main/resources/META-INF/NOTICE | 6 ++--
support/jcache/src/main/resources/META-INF/NOTICE | 2 +-
support/quartz/src/main/resources/META-INF/NOTICE | 2 +-
support/spring-boot/pom.xml | 2 +-
support/spring/src/main/resources/META-INF/NOTICE | 2 +-
tools/hasher/src/main/resources/META-INF/NOTICE | 6 ++--
.../shiro/web/filter/mgt/FilterChainManager.java | 2 +-
.../shiro/web/mgt/DefaultWebSubjectFactory.java | 2 +-
.../org/apache/shiro/web/tags/HasAnyRolesTag.java | 6 ++--
web/src/main/resources/META-INF/NOTICE | 6 ++--
65 files changed, 182 insertions(+), 182 deletions(-)
