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 f6ac8f8c94d2ef1a5a7ad1e2e6d01ec213897906 Merge: 9fd116cb9 4b2cd7dde Author: lprimak <[email protected]> AuthorDate: Mon Apr 27 23:53:02 2026 -0500 Merge branch 'main' into 3.x .github/workflows/codeql.yml | 6 +++--- .github/workflows/maven.yml | 2 +- .github/workflows/pre-commit-reusable.yml | 2 +- .github/workflows/scorecards.yml | 4 ++-- .pre-commit-config.yaml | 2 +- integration-tests/jakarta-ee/pom.xml | 2 +- pom.xml | 8 ++++---- support/jakarta-ee/pom.xml | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --cc integration-tests/jakarta-ee/pom.xml index d52db22a0,72aaf1990..9e6219426 --- a/integration-tests/jakarta-ee/pom.xml +++ b/integration-tests/jakarta-ee/pom.xml @@@ -33,10 -33,17 +33,10 @@@ </parent> <properties> - <arquillian.graphene.version>3.0.0.Final</arquillian.graphene.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- override older compiler source / target flags set by Apache parent POM --> - <maven.compiler.source>${maven.compiler.release}</maven.compiler.source> - <maven.compiler.target>${maven.compiler.release}</maven.compiler.target> - <arquillian.core.version>1.10.1.Final</arquillian.core.version> - <arquillian.payara5.version>2.5</arquillian.payara5.version> + <arquillian.graphene.version>3.0.1.Final</arquillian.graphene.version> - <shrinkwrap.resolver.version>3.3.6</shrinkwrap.resolver.version> <drone.browser>firefox</drone.browser> - <payara.version>5.2022.5.jdk21</payara.version> + <payara.version>7.2026.1</payara.version> <payara.start.skip>${skipITs}</payara.start.skip> <asadmin.cmd>asadmin</asadmin.cmd> <unix-sed-skip>${payara.start.skip}</unix-sed-skip> diff --cc pom.xml index 9c2811bdd,b01a7ed5f..bfea9e427 --- a/pom.xml +++ b/pom.xml @@@ -125,12 -129,14 +125,12 @@@ <mockito.version>5.23.0</mockito.version> <bytebuddy.version>1.18.8</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.44</lombok.version> - <jakarta.annotations.version>1.3.5</jakarta.annotations.version> + <lombok.version>1.18.46</lombok.version> <maven.compiler.release>${jdk.version}</maven.compiler.release> diff --cc support/jakarta-ee/pom.xml index 4d339a94d,30368b38a..9e953d2d9 --- a/support/jakarta-ee/pom.xml +++ b/support/jakarta-ee/pom.xml @@@ -71,7 -72,7 +71,7 @@@ <dependency> <groupId>org.omnifaces</groupId> <artifactId>omnifaces</artifactId> - <version>5.2.2</version> - <version>3.14.20</version> ++ <version>5.3.3</version> </dependency> <dependency> <groupId>org.jsoup</groupId>
