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
The following commit(s) were added to refs/heads/3.x by this push:
new 372f3fd4e [#1585] Jakarta namespace and java 17 for 3x (#2017)
372f3fd4e is described below
commit 372f3fd4e30c96dc98a99c63d7b01638b2b98ada
Author: Patrick (Gus) Heck <[email protected]>
AuthorDate: Fri Feb 6 14:54:13 2026 -0500
[#1585] Jakarta namespace and java 17 for 3x (#2017)
* SHIRO #1585 - Jakarta namespaces - WIP - compiles, TESTS FAIL Also
addresses #1629 and #2006 since Guice moves to 7.0.0 (EE9), Spring moves to
6.1.17 (EE10) and spring boot moves to 3.0.13 (EE10) Stuck on spring-boot
autowire test. Also EasyMock -> 5.5 to support modern java class file formats
Since Spring forces Java 17
* SHIRO #1585 - builds and all but 13 integration tests pass. Failures seem
to center around test harness construction (marked with @Disabled )
* fix: revert unnecessary changes
* more reverts
* more reverts
* review comment
* fixed compilation error
* more reverts
---------
Co-authored-by: lprimak <[email protected]>
---
integration-tests/guice/pom.xml | 6 +++---
lang/pom.xml | 1 -
support/cdi/pom.xml | 1 -
support/guice/pom.xml | 1 -
.../spring-boot/spring-boot-starter/src/test/resources/logback.xml | 2 +-
web/src/main/java/org/apache/shiro/web/servlet/NameableFilter.java | 2 +-
6 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/integration-tests/guice/pom.xml b/integration-tests/guice/pom.xml
index d93747057..dd3670ea4 100644
--- a/integration-tests/guice/pom.xml
+++ b/integration-tests/guice/pom.xml
@@ -27,9 +27,9 @@
<version>999-SNAPSHOT</version>
</parent>
- <artifactId>shiro-its-guice</artifactId>
- <name>Apache Shiro :: ITs :: Guice</name>
- <packaging>war</packaging>
+ <artifactId>shiro-its-guice</artifactId>
+ <name>Apache Shiro :: ITs :: Guice</name>
+ <packaging>war</packaging>
<properties>
<groups>none()</groups>
diff --git a/lang/pom.xml b/lang/pom.xml
index 71d3bf1ec..893923967 100644
--- a/lang/pom.xml
+++ b/lang/pom.xml
@@ -59,7 +59,6 @@
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
- <version>4.0.0</version>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/support/cdi/pom.xml b/support/cdi/pom.xml
index 21bb5b7fe..279bc6abc 100644
--- a/support/cdi/pom.xml
+++ b/support/cdi/pom.xml
@@ -62,7 +62,6 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
- <version>3.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 1c8ad4bca..81b3b9061 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
diff --git
a/support/spring-boot/spring-boot-starter/src/test/resources/logback.xml
b/support/spring-boot/spring-boot-starter/src/test/resources/logback.xml
index 6d2f2cf57..972df2fe7 100644
--- a/support/spring-boot/spring-boot-starter/src/test/resources/logback.xml
+++ b/support/spring-boot/spring-boot-starter/src/test/resources/logback.xml
@@ -24,7 +24,7 @@
class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>
- %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)]
%yellow(%C{1}): %msg%n%throwable
+ %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)]
%yellow(%C{5}): %msg%n%throwable
</Pattern>
</layout>
</appender>
diff --git a/web/src/main/java/org/apache/shiro/web/servlet/NameableFilter.java
b/web/src/main/java/org/apache/shiro/web/servlet/NameableFilter.java
index daa5548db..e683f6866 100644
--- a/web/src/main/java/org/apache/shiro/web/servlet/NameableFilter.java
+++ b/web/src/main/java/org/apache/shiro/web/servlet/NameableFilter.java
@@ -67,7 +67,7 @@ public abstract class NameableFilter extends AbstractFilter
implements Nameable
* servlet container at start-up:
* <pre>
* this.name = {@link #getFilterConfig() getFilterConfig()}.
- * {@link jakarta.servlet.FilterConfig#getFilterName()
getName()};</pre>
+ * {@link jakarta.servlet.FilterConfig#getFilterName() getName()};</pre>
*
* @param name the name of the filter.
*/
