chore(3.x): Migrate to jakarta EE 10 using OpenRewrite

bom/pom.xml

@@ -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>
@@ -54,7 +52,6 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-jakarta-ee</artifactId>
-                <classifier>jakarta</classifier>
                 <version>${project.version}</version>
                 <exclusions>
                     <exclusion>
@@ -66,7 +63,6 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-cdi</artifactId>
-                <classifier>jakarta</classifier>
                 <version>${project.version}</version>
                 <exclusions>
                     <exclusion>
@@ -78,7 +74,6 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-jaxrs</artifactId>
-                <classifier>jakarta</classifier>
                 <version>${project.version}</version>
                 <exclusions>
                     <exclusion>
@@ -90,7 +85,6 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-spring</artifactId>
-                <classifier>jakarta</classifier>
                 <version>${project.version}</version>
                 <exclusions>
                     <exclusion>
@@ -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>
@@ -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>

core/src/main/java/org/apache/shiro/authz/aop/DenyAllAnnotationHandler.java

@@ -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;
 
 /**

core/src/main/java/org/apache/shiro/authz/aop/PermitAllAnnotationHandler.java

@@ -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

core/src/main/java/org/apache/shiro/authz/aop/RolesAllowedAnnotationHandler.java

@@ -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;
 
 /**

core/src/test/java/org/apache/shiro/authz/aop/DenyAllAnnotationHandlerTest.java

@@ -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.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;

core/src/test/java/org/apache/shiro/authz/aop/PermitAllAnnotationHandlerTest.java

@@ -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;
 
 /**

core/src/test/java/org/apache/shiro/authz/aop/RolesAllowedAnnotationHandlerTest.java

@@ -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.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;

integration-tests/guice3/pom.xml

@@ -56,9 +56,10 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
+      <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -106,8 +107,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>apache-jsp</artifactId>
+            <groupId>org.eclipse.jetty.ee9</groupId>
+            <artifactId>jetty-ee9-apache-jsp</artifactId>
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>

integration-tests/guice3/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java

@@ -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 {
 

integration-tests/guice3/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java

@@ -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;
 

integration-tests/guice3/src/main/webapp/WEB-INF/web.xml

@@ -17,10 +17,10 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 
     <listener>
         <listener-class>org.apache.shiro.samples.guice.SampleShiroGuiceBootstrap</listener-class>

integration-tests/guice4/pom.xml

@@ -65,9 +65,10 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
+      <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -115,8 +116,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>apache-jsp</artifactId>
+            <groupId>org.eclipse.jetty.ee9</groupId>
+            <artifactId>jetty-ee9-apache-jsp</artifactId>
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>

integration-tests/guice4/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java

@@ -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 {
 

integration-tests/guice4/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java

@@ -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;
 

integration-tests/guice4/src/main/webapp/WEB-INF/web.xml

@@ -17,10 +17,10 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 
     <listener>
         <listener-class>org.apache.shiro.samples.guice.SampleShiroGuiceBootstrap</listener-class>

integration-tests/jakarta-ee/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.omnifaces</groupId>
             <artifactId>omnifaces</artifactId>
-            <version>3.14.12</version>
+            <version>5.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -77,19 +77,19 @@
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>8.0.0</version>
+            <version>10.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
+            <version>2.1.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>4.0.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -148,6 +148,11 @@
             <artifactId>flowlogix-jee</artifactId>
             <version>5.5.6</version>
         </dependency>
+    <dependency>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>3.1.0</version>
+    </dependency>
 
         <!-- Arquillian test dependencies -->
         <dependency>

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/cdi/CipherKeyGenerator.java

@@ -13,7 +13,7 @@
  */
 package org.apache.shiro.testing.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.shiro.cdi.annotations.CipherKeySupplier;
 

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/cdi/ComponentInjectionBean.java

@@ -13,8 +13,8 @@
  */
 package org.apache.shiro.testing.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import lombok.Getter;
 import org.apache.shiro.cdi.annotations.NoSessionCreation;

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/FormBean.java

@@ -13,7 +13,7 @@
  */
 package org.apache.shiro.testing.jakarta.ee;
 
-import javax.enterprise.inject.Model;
+import jakarta.enterprise.inject.Model;
 
 import lombok.Getter;
 import lombok.Setter;

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/PropertyPrincipal.java

@@ -14,7 +14,7 @@
 package org.apache.shiro.testing.jakarta.ee;
 
 import java.io.Serializable;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/PropertyRealm.java

@@ -14,8 +14,8 @@
 package org.apache.shiro.testing.jakarta.ee;
 
 import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import lombok.Getter;
 import lombok.Setter;

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedFacesViewScopedBean.java

@@ -17,11 +17,11 @@
 
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Named;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresUser;

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedOmniViewScopedBean.java

@@ -17,10 +17,10 @@
 
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresUser;

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedOneMethod.java

@@ -13,7 +13,7 @@
  */
 package org.apache.shiro.testing.jakarta.ee;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import org.apache.shiro.authz.annotation.RequiresUser;
 

integration-tests/jakarta-ee/src/main/java/org/apache/shiro/testing/jakarta/ee/ProtectedSessionScopedBean.java

@@ -17,10 +17,10 @@
 
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresUser;