Resolves wildfly-security-incubator#130 Update the distributed realm …

…demo to Jakarta EE 10 Also switch to WildFly 27.0.1.Final
schlijo · Dec 21, 2022 · 08e54c0 · 08e54c0
1 parent 2f8ee9d
commit 08e54c0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/distributed-realm/pom.xml b/distributed-realm/pom.xml
@@ -23,16 +23,23 @@
     <groupId>org.wildfly.security.examples</groupId>
     <artifactId>distributed-realm-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
+
     <packaging>war</packaging>
     <name>distributed-realm-demo</name>
     <description>Example of ditributed realm in elytron subsystem</description>
 
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <version.wildfly>27.0.1.Final</version.wildfly>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-jakartaee8-with-tools</artifactId>
-                <version>${version.server.bom}</version>
+                <artifactId>wildfly-ee-with-tools</artifactId>
+                <version>${version.wildfly}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -45,13 +52,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.spec.javax.annotation</groupId>
-            <artifactId>jboss-annotations-api_1.3_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.servlet</groupId>
-            <artifactId>jboss-servlet-api_4.0_spec</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -61,7 +63,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>2.0.0.Final</version>
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
@@ -73,10 +74,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <version.jboss.spec.javaee.7.0>1.1.1.Final</version.jboss.spec.javaee.7.0>
-        <version.server.bom>24.0.0.Final</version.server.bom>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
 </project>
diff --git a/distributed-realm/restoreDistributedRealm.cli b/distributed-realm/restoreDistributedRealm.cli
@@ -1,6 +1,6 @@
 batch
 
-undeploy demo-security.war
+undeploy distributed-realm-demo.war
 
 /subsystem=undertow/application-security-domain=httpSD:remove()
 

diff --git a/distributed-realm/src/main/java/realms/demo/SecuredServlet.java b/distributed-realm/src/main/java/realms/demo/SecuredServlet.java
@@ -21,13 +21,13 @@
 import java.io.PrintWriter;
 import java.security.Principal;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 @WebServlet("/secure")