From d90ad2a29bd766e50a7ae6824259a8f6d33b4926 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Mon, 28 Aug 2023 14:47:21 +0100
Subject: [PATCH] feat: Upgrade To Tomcat 10 - Meeds-io/MIPs#76

---
 .gitignore                                         | 12 ++----------
 exo.core.component.database/pom.xml                |  2 +-
 exo.core.component.organization.api/pom.xml        | 12 +-----------
 exo.core.component.security.core/pom.xml           |  2 +-
 .../security/web/ConversationStateListener.java    |  8 ++++----
 .../services/security/web/HttpSessionStateKey.java |  2 +-
 .../web/JAASConversationStateListener.java         |  4 ++--
 .../security/web/SetCurrentIdentityFilter.java     | 14 +++++++-------
 exo.core.component.xml-processing/pom.xml          |  2 +-
 pom.xml                                            |  5 -----
 10 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index c778a56fc..5d6824df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,14 +3,6 @@
 #
 **/pom.xml.versionsBackup
 
-# /exo.core.component.security.core/
-/exo.core.component.security.core/.project
-/exo.core.component.security.core/.classpath
-/exo.core.component.security.core/target
-
-# /packaging/module/
-/packaging/module/target
-
 #
 # Default excludes
 #
@@ -48,5 +40,5 @@ target/
 
 # Misc
 *.swp
-.rebel.xml.bak
-rebel.xml
+*.log
+*.epoch
diff --git a/exo.core.component.database/pom.xml b/exo.core.component.database/pom.xml
index 6a0ed3e15..44a52b322 100644
--- a/exo.core.component.database/pom.xml
+++ b/exo.core.component.database/pom.xml
@@ -140,7 +140,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>
diff --git a/exo.core.component.organization.api/pom.xml b/exo.core.component.organization.api/pom.xml
index aeb584f44..1cd4e74ea 100644
--- a/exo.core.component.organization.api/pom.xml
+++ b/exo.core.component.organization.api/pom.xml
@@ -69,16 +69,6 @@
             </exclusion>
          </exclusions>
       </dependency>
-      <dependency>
-         <groupId>org.ogce</groupId>
-         <artifactId>xpp3</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
       <dependency>
          <groupId>org.mockito</groupId>
          <artifactId>mockito-inline</artifactId>
@@ -106,7 +96,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>
diff --git a/exo.core.component.security.core/pom.xml b/exo.core.component.security.core/pom.xml
index 846efb185..8083c9ecd 100644
--- a/exo.core.component.security.core/pom.xml
+++ b/exo.core.component.security.core/pom.xml
@@ -64,7 +64,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>
diff --git a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java
index b9294b592..d2ad3e278 100644
--- a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java
+++ b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java
@@ -28,10 +28,10 @@
 import org.exoplatform.services.security.ConversationState;
 import org.exoplatform.services.security.StateKey;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
 
 /**
  * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a>
diff --git a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/HttpSessionStateKey.java b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/HttpSessionStateKey.java
index 535d57539..3aa6a5143 100644
--- a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/HttpSessionStateKey.java
+++ b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/HttpSessionStateKey.java
@@ -20,7 +20,7 @@
 
 import org.exoplatform.services.security.StateKey;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 /**
  * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a>
diff --git a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java
index 29360cc5a..3b6bc7a91 100644
--- a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java
+++ b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java
@@ -27,8 +27,8 @@
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
 
 /**
  * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a>
diff --git a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java
index 8939c1a3a..264aa8891 100644
--- a/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java
+++ b/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java
@@ -33,13 +33,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 /**
  * Created by The eXo Platform SAS .
diff --git a/exo.core.component.xml-processing/pom.xml b/exo.core.component.xml-processing/pom.xml
index 57bbb7a73..36bc8079e 100644
--- a/exo.core.component.xml-processing/pom.xml
+++ b/exo.core.component.xml-processing/pom.xml
@@ -95,7 +95,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>
diff --git a/pom.xml b/pom.xml
index 08191c04e..54f17ea6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,11 +123,6 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <scope>test</scope>
-      </dependency>
    </dependencies>
    <!-- This profile is used to allow github action to build branches. The github action is used for sonar analysis -->
    <profiles>