Skip to content

[#1585] Jakarta namespace and java 17 for 3x #2017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lprimak merged 11 commits into from
Feb 6, 2026
+5 −8
Merged

[#1585] Jakarta namespace and java 17 for 3x #2017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fc5f010
SHIRO #1585 - Jakarta namespaces - WIP - compiles, TESTS FAIL Also ad…
nsoft Feb 24, 2025
d9ec34a
SHIRO #1585 - builds and all but 13 integration tests pass. Failures …
nsoft Mar 3, 2025
5542a65
Merge branch '3.x' into jakarta-namespace-3x
lprimak Jan 29, 2026
596b165
fix: revert unnecessary changes
lprimak Jan 29, 2026
f047fc3
more reverts
lprimak Jan 29, 2026
0cea91e
more reverts
lprimak Jan 29, 2026
d103beb
Merge remote-tracking branch 'origin/3.x' into jakarta-namespace-3x
lprimak Jan 29, 2026
2d7fd01
review comment
lprimak Jan 29, 2026
8d0915f
fixed compilation error
lprimak Jan 29, 2026
765fa9b
Merge branch '3.x' into jakarta-namespace-3x
lprimak Feb 6, 2026
5f1fb47
more reverts
lprimak Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions integration-tests/guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion lang/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion support/cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion support/guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion support/spring-boot/spring-boot-starter/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion web/src/main/java/org/apache/shiro/web/servlet/NameableFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected String getName() {
* 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.
*/
Expand Down