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 2026/03/11 14:16:17 UTC
(shiro) branch 3.x updated (ed92e3f17 -> d21901326)
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 ed92e3f17 enh: made AuthenticationInfo.merge() return this to make it fluent and easier to use
add a0b598ade chore(deps-dev): bump commons-logging:commons-logging
add 56c04e42e Merge pull request #2614 from apache/dependabot/maven/commons-logging-commons-logging-1.3.6
add 32a73fd8f Add pre-commit ecosystem to Dependabot
add f59c705dd Merge pull request #2620 from jbampton/dependabot-add-pre-commit
add 0ac96a94f chore(deps): bump github/codeql-action in the github-dependencies group
add a107bfb38 Merge pull request #2611 from apache/dependabot/github_actions/github-dependencies-b974f349ee
add f389174f0 chore(deps): bump org.projectlombok:lombok from 1.18.42 to 1.18.44
add b010f5b29 Merge pull request #2623 from apache/dependabot/maven/org.projectlombok-lombok-1.18.44
add bb179d5ab chore(deps): bump the github-dependencies group with 4 updates
add 4099ab721 Merge pull request #2621 from apache/dependabot/pre_commit/github-dependencies-e573e0e192
add c214cb3b2 chore(deps-dev): bump org.apache.maven.plugins:maven-resources-plugin
add 02b5f8ef2 Merge pull request #2613 from apache/dependabot/maven/org.apache.maven.plugins-maven-resources-plugin-3.5.0
add df33b4a77 chore(deps): bump org.apache.tomcat:tomcat-catalina
add f4bc9dea1 Merge pull request #2616 from apache/dependabot/maven/integration-tests/meecrowave-support/org.apache.tomcat-tomcat-catalina-9.0.113
add 0539bd5ad chore(deps): bump org.apache.tomcat.embed:tomcat-embed-core
add 3f566c6e6 Merge pull request #2617 from apache/dependabot/maven/samples/spring-boot-web/org.apache.tomcat.embed-tomcat-embed-core-9.0.113
add 58b475a08 chore(deps): bump org.apache.tomcat.embed:tomcat-embed-core (#2619)
add edfa467a9 chore(deps): bump org.apache.tomcat.embed:tomcat-embed-core (#2618)
add cf2f71e93 chore(deps): bump org.apache.tomcat:tomcat-catalina (#2615)
add ea4ac9bcf chore(deps): bump org.omnifaces:omnifaces from 3.14.12 to 3.14.13 (#2612)
add df947f9eb chore: moved manual tomcat version to variable
add b1eca1d23 chore: moved tomcat 10 version into a variable
new d21901326 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/dependabot.yml | 10 ++++++++++
.github/linters/mlc_config.json | 3 +++
.github/workflows/codeql.yml | 4 ++--
.github/workflows/scorecards.yml | 2 +-
.pre-commit-config.yaml | 8 ++++----
pom.xml | 16 ++--------------
support/features/pom.xml | 2 +-
7 files changed, 23 insertions(+), 22 deletions(-)
(shiro) 01/01: Merge branch 'main' into 3.x
Posted by lp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit d219013267fa4feeeacd65265d897986d3f3a458
Merge: ed92e3f17 b1eca1d23
Author: lprimak <le...@flowlogix.com>
AuthorDate: Wed Mar 11 09:12:45 2026 -0500
Merge branch 'main' into 3.x
.github/dependabot.yml | 10 ++++++++++
.github/linters/mlc_config.json | 3 +++
.github/workflows/codeql.yml | 4 ++--
.github/workflows/scorecards.yml | 2 +-
.pre-commit-config.yaml | 8 ++++----
pom.xml | 16 ++--------------
support/features/pom.xml | 2 +-
7 files changed, 23 insertions(+), 22 deletions(-)
diff --cc pom.xml
index 8094beadd,a59dc2813..e77825387
--- a/pom.xml
+++ b/pom.xml
@@@ -98,14 -96,20 +98,14 @@@
<commons.collection.version>3.2.2</commons.collection.version>
<commons.configuration2.version>2.13.0</commons.configuration2.version>
<commons.lang3.version>3.20.0</commons.lang3.version>
- <commons.logging.version>1.3.5</commons.logging.version>
+ <commons.logging.version>1.3.6</commons.logging.version>
<commons.text.version>1.8</commons.text.version>
- <!-- Don't change this version without also changing the shiro-ehcache and shiro-features
- modules' OSGi metadata: -->
- <ehcache.version>2.6.11</ehcache.version>
- <!-- Don't change this version without also changing the shiro-hazelcast and shiro-features OSGi metadata: -->
- <hazelcast.version>5.3.8</hazelcast.version>
<hsqldb.version>2.7.4</hsqldb.version>
- <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
<jcache.api.version>1.1.1</jcache.api.version>
- <jdk.version>11</jdk.version>
- <jetty.version>9.4.58.v20250814</jetty.version>
- <tomcat.version>9.0.113</tomcat.version>
- <tomcat10.version>10.1.50</tomcat10.version>
+ <jdk.version>17</jdk.version>
+ <tomcat.version>11.0.18</tomcat.version>
+ <jakarta.ee.version>11.0.0</jakarta.ee.version>
+ <jetty.version>12.1.6</jetty.version>
<owasp.java.encoder.version>1.4.0</owasp.java.encoder.version>
<!-- Don't change this version without also changing the shiro-quartz and shiro-features
modules' OSGi metadata: -->
@@@ -125,12 -129,14 +125,12 @@@
<mockito.version>5.22.0</mockito.version>
<bytebuddy.version>1.18.7</bytebuddy.version>
<gmaven.version>4.3.1</gmaven.version>
- <groovy.version>4.0.27</groovy.version>
- <junit.version>5.13.4</junit.version>
- <junit.engine.version>1.13.4</junit.engine.version>
+ <groovy.version>5.0.4</groovy.version>
+ <junit.version>6.0.3</junit.version>
<junit.server.jetty.version>3.5.0</junit.server.jetty.version>
- <hibernate.version>5.6.15.Final</hibernate.version>
+ <hibernate.version>7.2.6.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
- <lombok.version>1.18.42</lombok.version>
- <jakarta.annotations.version>1.3.5</jakarta.annotations.version>
+ <lombok.version>1.18.44</lombok.version>
<maven.compiler.release>${jdk.version}</maven.compiler.release>
@@@ -1184,18 -1286,30 +1184,6 @@@
<scope>runtime</scope>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>
-- <dependency>
-- <groupId>org.apache.taglibs</groupId>
-- <artifactId>taglibs-standard-spec</artifactId>
-- <version>${taglibs.standard.version}</version>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.apache.taglibs</groupId>
-- <artifactId>taglibs-standard-impl</artifactId>
-- <version>${taglibs.standard.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
-- <scope>provided</scope>
-- </dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>