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

Open
wants to merge 2 commits into
base: 3.x
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 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
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ updates:
ignore:
- dependency-name: "jakarta.servlet.*:*"
update-types: [ "version-update:semver-major" ]
- dependency-name: "javax.servlet:javax.servlet-api"
- dependency-name: "jakarta.servlet:jakarta.servlet-api"
update-types: [ "version-update:semver-major" ]
- dependency-name: "org.glassfish.web:jakarta.servlet.jsp.jstl"
update-types: [ "version-update:semver-major" ]
Expand Down
10 changes: 1 addition & 9 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>shiro-root</artifactId>
<groupId>org.apache.shiro</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -36,13 +36,11 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -54,7 +52,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-jakarta-ee</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -66,7 +63,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-cdi</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -78,7 +74,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-jaxrs</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -90,7 +85,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -102,7 +96,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -114,7 +107,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
<classifier>jakarta</classifier>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion cache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion config/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion config/ogdl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>shiro-config</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* RememberMe services (the <tt>UsernamePasswordToken</tt> already implements this interface).
* <p/>
* <p>If you are familiar with JAAS, an <tt>AuthenticationToken</tt> replaces the concept of a
* {@link javax.security.auth.callback.Callback}, and defines meaningful behavior
* {@link jakarta.security.auth.callback.Callback}, and defines meaningful behavior
* (<tt>Callback</tt> is just a marker interface, and of little use). We
* also think the name <em>AuthenticationToken</em> more accurately reflects its true purpose
* in a login framework, whereas <em>Callback</em> is less obvious.
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/shiro/authz/aop/DenyAllAnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.apache.shiro.authz.UnauthenticatedException;
import org.apache.shiro.authz.UnauthorizedException;

import javax.annotation.security.DenyAll;
import jakarta.annotation.security.DenyAll;
import java.lang.annotation.Annotation;

/**
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/shiro/authz/aop/PermitAllAnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
*/
package org.apache.shiro.authz.aop;

import javax.annotation.security.PermitAll;
import jakarta.annotation.security.PermitAll;
import java.lang.annotation.Annotation;

/**
* This {@link org.apache.shiro.aop.AnnotationHandler AnnotationHandler} allows access from any subject
* (anonymous or logged in user). It is largely a no-op or for documentation. However, this annotation WILL override
* a {@link javax.annotation.security.DenyAll DenyAll} or {@link javax.annotation.security.RolesAllowed RolesAllowed}
* a {@link jakarta.annotation.security.DenyAll DenyAll} or {@link jakarta.annotation.security.RolesAllowed RolesAllowed}
* annotation if those annotations are placed at the class level and {@link PermitAll} is placed on a method.
*
* @since 2.0
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/shiro/authz/aop/RolesAllowedAnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import org.apache.shiro.authz.AuthorizationException;

import javax.annotation.security.RolesAllowed;
import jakarta.annotation.security.RolesAllowed;
import java.lang.annotation.Annotation;

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/shiro/session/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* A {@code Session} is intended to be managed by the business tier and accessible via other
* tiers without being tied to any given client technology. This is a <em>great</em> benefit to Java
* systems, since until now, the only viable session mechanisms were the
* {@code javax.servlet.http.HttpSession} or Stateful Session EJB's, which many times
* {@code jakarta.servlet.http.HttpSession} or Stateful Session EJB's, which many times
* unnecessarily coupled applications to web or ejb technologies.
*
* @since 0.1
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/shiro/session/mgt/SessionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public interface SessionContext extends Map<String, Object> {
* {@code Session}.
* <p/>
* In web-based systems, this host can be inferred from the incoming request, e.g.
* {@code javax.servlet.ServletRequest#getRemoteAddr()} or {@code javax.servlet.ServletRequest#getRemoteHost()}
* {@code jakarta.servlet.ServletRequest#getRemoteAddr()} or {@code jakarta.servlet.ServletRequest#getRemoteHost()}
* methods, or in socket-based systems, it can be obtained via inspecting the socket
* initiator's host IP.
* <p/>
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/org/apache/shiro/authz/aop/DenyAllAnnotationHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.shiro.test.SecurityManagerTestSupport;
import org.junit.jupiter.api.Test;

import javax.annotation.security.DenyAll;
import jakarta.annotation.security.DenyAll;
import java.lang.annotation.Annotation;

import static org.easymock.EasyMock.createMock;
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/org/apache/shiro/authz/aop/PermitAllAnnotationHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.apache.shiro.test.SecurityManagerTestSupport;
import org.junit.jupiter.api.Test;

import javax.annotation.security.PermitAll;
import jakarta.annotation.security.PermitAll;
import java.lang.annotation.Annotation;

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/org/apache/shiro/authz/aop/RolesAllowedAnnotationHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.shiro.test.SecurityManagerTestSupport;
import org.junit.jupiter.api.Test;

import javax.annotation.security.RolesAllowed;
import jakarta.annotation.security.RolesAllowed;
import java.lang.annotation.Annotation;

import static org.junit.jupiter.api.Assertions.assertThrows;
Expand Down
2 changes: 1 addition & 1 deletion crypto/cipher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion crypto/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion crypto/hash/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion crypto/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>shiro-crypto</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion crypto/support/hashes/argon2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.crypto</groupId>
<artifactId>shiro-crypto-support</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion crypto/support/hashes/bcrypt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.crypto</groupId>
<artifactId>shiro-crypto-support</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion crypto/support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.shiro.crypto</groupId>
Expand Down
2 changes: 1 addition & 1 deletion event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
62 changes: 52 additions & 10 deletions integration-tests/guice4/pom.xml → integration-tests/guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-guice4</artifactId>
<name>Apache Shiro :: ITs :: Guice 4</name>
<packaging>war</packaging>
<artifactId>shiro-its-guice</artifactId>
<name>Apache Shiro :: ITs :: Guice 4</name>
<packaging>war</packaging>

<properties>
<groups>none()</groups>
Expand All @@ -53,7 +53,54 @@
</plugins>
</build>

<dependencies>
<dependencies>
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-guice</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
Expand All @@ -64,11 +111,6 @@
<artifactId>taglibs-standard-impl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...ples/guice/SampleShiroGuiceBootstrap.java → ...ples/guice/SampleShiroGuiceBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import com.google.inject.servlet.GuiceServletContextListener;
import org.apache.shiro.guice.web.ShiroWebModule;

import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletContextEvent;

public class SampleShiroGuiceBootstrap extends GuiceServletContextListener {

Expand Down
4 changes: 2 additions & 2 deletions ...mples/guice/SampleShiroServletModule.java → ...mples/guice/SampleShiroServletModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.apache.shiro.web.mgt.WebSecurityManager;

import javax.inject.Singleton;
import javax.servlet.ServletContext;
import jakarta.inject.Singleton;
import jakarta.servlet.ServletContext;
import java.net.MalformedURLException;
import java.net.URL;

Expand Down
0 ...ests/guice3/src/main/resources/log4j2.xml → ...tests/guice/src/main/resources/log4j2.xml
View file
Open in desktop
File renamed without changes.
0 .../guice3/src/main/webapp/WEB-INF/shiro.ini → ...s/guice/src/main/webapp/WEB-INF/shiro.ini
View file
Open in desktop
File renamed without changes.
0 ...ts/guice3/src/main/webapp/WEB-INF/web.xml → ...sts/guice/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
File renamed without changes.
0 .../guice3/src/main/webapp/account/index.jsp → ...s/guice/src/main/webapp/account/index.jsp
View file
Open in desktop
File renamed without changes.
0 ...ion-tests/guice3/src/main/webapp/home.jsp → ...tion-tests/guice/src/main/webapp/home.jsp
View file
Open in desktop
File renamed without changes.
0 ...-tests/guice3/src/main/webapp/include.jsp → ...n-tests/guice/src/main/webapp/include.jsp
View file
Open in desktop
File renamed without changes.
0 ...on-tests/guice3/src/main/webapp/index.jsp → ...ion-tests/guice/src/main/webapp/index.jsp
View file
Open in desktop
File renamed without changes.
0 ...on-tests/guice3/src/main/webapp/login.jsp → ...ion-tests/guice/src/main/webapp/login.jsp
View file
Open in desktop
File renamed without changes.
0 ...on-tests/guice3/src/main/webapp/style.css → ...ion-tests/guice/src/main/webapp/style.css
View file
Open in desktop
File renamed without changes.
Loading