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

---
 pom.xml | 81 ++++++++++++++++++++++++---------------------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index 01221988..e627d75b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <commons-chain.version>1.2</commons-chain.version>
     <commons-codec.version>1.10</commons-codec.version>
     <commons-collections.version>3.2.2</commons-collections.version>
-    <commons-fileupload.version>1.5</commons-fileupload.version>
     <commons-httpclient.version>3.1</commons-httpclient.version>
     <commons-io.version>2.11.0</commons-io.version>
     <commons-lang.version>2.6</commons-lang.version>
@@ -77,8 +76,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <javax.annotation.version>1.0</javax.annotation.version>
     <javax.inject.version>1</javax.inject.version>
     <javax.portlet.version>2.0</javax.portlet.version>
-    <javax.servlet.version>4.0.1</javax.servlet.version>
-    <javax.servlet.jsp.version>2.3.3</javax.servlet.jsp.version>
+    <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
+    <jakarta.servlet.jsp.version>3.1.1</jakarta.servlet.jsp.version>
     <javax.transaction.version>1.3</javax.transaction.version>
     <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
     <!-- 1.1.3 used by jdom has some wrong dependencies -->
@@ -98,7 +97,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     -->
     <version.eclipse.jetty-client>10.0.11</version.eclipse.jetty-client>
 
-    <org.exoplatform.framework.junit.version>1.2.4-GA</org.exoplatform.framework.junit.version>
     <org.hibernate.common.hibernate-commons-annotations.version>5.1.2.Final</org.hibernate.common.hibernate-commons-annotations.version>
     <org.hibernate.hibernate-core.version>5.6.3.Final</org.hibernate.hibernate-core.version>
     <org.hibernate.hibernate-entitymanager.version>5.6.3.Final</org.hibernate.hibernate-entitymanager.version>
@@ -118,16 +116,14 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <org.less4j.version>1.17.2</org.less4j.version>
     <org.liquibase.version>4.9.1</org.liquibase.version>
     <org.mockito.version>3.11.1</org.mockito.version>
-    <org.ogce.xpp3.version>1.1.6</org.ogce.xpp3.version>
     <org.picketlink.idm.version>1.4.6.Final</org.picketlink.idm.version>
     <org.picketlink.federation.version>2.5.5.Final</org.picketlink.federation.version>
-    <org.jboss.negotiation.version>2.2.5.Final</org.jboss.negotiation.version>
+    <org.jboss.negotiation.version>3.0.4.Final</org.jboss.negotiation.version>
     <org.slf4j.version>1.7.36</org.slf4j.version>
     <org.log4j.api.version>2.18.0</org.log4j.api.version>
     <org.staxnav.version>0.9.8</org.staxnav.version>
     <org.suigeneris.version>0.4.2</org.suigeneris.version>
     <org.web3j.version>4.9.4</org.web3j.version>
-    <portals-bridges.version>1.0.4</portals-bridges.version>
     <quartz.version>2.3.2</quartz.version>
     <xerces.version>2.12.2</xerces.version>
     <javax.ccpp.version>1.0</javax.ccpp.version>
@@ -166,12 +162,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <transactions-jta.version>3.8.0</transactions-jta.version>
     <com.experlog.xapool.version>1.5.0</com.experlog.xapool.version>
     <!-- For testing only -->
-    <version.arquillian>1.1.12.Final</version.arquillian>
-    <version.arquillian.tomcat>1.1.0.Final</version.arquillian.tomcat>
+    <version.arquillian>1.7.1.Final</version.arquillian>
+    <version.arquillian.tomcat>1.2.0.Final</version.arquillian.tomcat>
     <version.shrinkwrap>1.2.6</version.shrinkwrap>
     <version.shrinkwrap.resolver>2.2.5</version.shrinkwrap.resolver>
     <!-- Servers -->
-    <org.apache.tomcat.version>9.0.80</org.apache.tomcat.version>
+    <org.apache.tomcat.version>10.1.13</org.apache.tomcat.version>
     <com.fasterxml.jackson.version>2.13.5</com.fasterxml.jackson.version>
     <org.graalvm.js.version>22.0.0</org.graalvm.js.version>
   </properties>
@@ -235,11 +231,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <artifactId>commons-collections</artifactId>
         <version>${commons-collections.version}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <version>${commons-fileupload.version}</version>
-      </dependency>
       <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
@@ -361,16 +352,22 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <groupId>javax.portlet</groupId>
         <artifactId>portlet-api</artifactId>
         <version>${javax.portlet.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>${javax.servlet.version}</version>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>${jakarta.servlet.version}</version>
       </dependency>
       <dependency>
-        <groupId>javax.servlet.jsp</groupId>
-        <artifactId>javax.servlet.jsp-api</artifactId>
-        <version>${javax.servlet.jsp.version}</version>
+        <groupId>jakarta.servlet.jsp</groupId>
+        <artifactId>jakarta.servlet.jsp-api</artifactId>
+        <version>${jakarta.servlet.jsp.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.resource</groupId>
@@ -434,9 +431,15 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.portals.bridges</groupId>
-        <artifactId>portals-bridges-common</artifactId>
-        <version>${portals-bridges.version}</version>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpmime</artifactId>
+        <version>${org.apache.httpcomponents.httpclient.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.poi</groupId>
@@ -564,11 +567,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <artifactId>jetty-util-ajax</artifactId>
         <version>${version.eclipse.jetty-client}</version>
       </dependency>
-      <dependency>
-        <groupId>org.exoplatform.tool</groupId>
-        <artifactId>exo.tool.framework.junit</artifactId>
-        <version>${org.exoplatform.framework.junit.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
@@ -659,7 +657,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <artifactId>jbossjta</artifactId>
         <version>${org.jboss.jbossts.version}</version>
       </dependency>
-      <!-- Portlet Bridge -->
       <dependency>
         <groupId>org.jgroups</groupId>
         <artifactId>jgroups</artifactId>
@@ -756,11 +753,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <artifactId>mockito-inline</artifactId>
         <version>${org.mockito.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.ogce</groupId>
-        <artifactId>xpp3</artifactId>
-        <version>${org.ogce.xpp3.version}</version>
-      </dependency>
       <!-- Picketlink SAML -->
       <dependency>
          <groupId>org.picketlink</groupId>
@@ -1082,6 +1074,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <version>${version.arquillian}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.arquillian.test</groupId>
+        <artifactId>arquillian-test-api</artifactId>
+        <version>${version.arquillian}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.jboss.arquillian.junit</groupId>
         <artifactId>arquillian-junit-container</artifactId>
@@ -1120,21 +1118,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       </dependency>
       <dependency>
         <groupId>org.jboss.arquillian.container</groupId>
-        <artifactId>arquillian-tomcat-embedded-9</artifactId>
+        <artifactId>arquillian-tomcat-embedded-10</artifactId>
         <version>${version.arquillian.tomcat}</version>
         <scope>test</scope>
       </dependency>
-      <!-- SPNEGO support using JBoss Negotiation -->
-      <dependency>
-        <groupId>org.jboss.security</groupId>
-        <artifactId>jboss-negotiation-spnego</artifactId>
-        <version>${org.jboss.negotiation.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.security</groupId>
-        <artifactId>jboss-negotiation-common</artifactId>
-        <version>${org.jboss.negotiation.version}</version>
-      </dependency>
       <!-- Third party dependencies used by deprecated services  -->
       <dependency>
         <groupId>com.experlog</groupId>