feat: Upgrade To Tomcat 10 - Meeds-io/MIPs#76 (#83)

This change will upgrade Jakarta Servlet API 6.0 packages to be compatible with Tomcat 10.
exoplatform · Dec 20, 2023 · 7d027d3 · 7d027d3
1 parent f426fd8
commit 7d027d3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 43 deletions.
diff --git a/services/src/main/java/org/exoplatform/webconferencing/jitsi/rest/JitsiContextResource.java b/services/src/main/java/org/exoplatform/webconferencing/jitsi/rest/JitsiContextResource.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.TimeUnit;
 
 import javax.jcr.RepositoryException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;

diff --git a/.../java/org/exoplatform/webconferencing/jitsi/rest/filter/WebconferencingSessionFilter.java b/.../java/org/exoplatform/webconferencing/jitsi/rest/filter/WebconferencingSessionFilter.java
@@ -6,13 +6,13 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.exoplatform.common.http.HTTPStatus;
 import org.exoplatform.container.ExoContainer;

diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -47,36 +47,6 @@
       <scope>provided</scope>
     </dependency>
     <!-- Application dependencies-->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.exoplatform.core</groupId>
-      <artifactId>exo.core.component.organization.api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>exo.kernel.commons</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>exo.kernel.container</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.exoplatform.social</groupId>
       <artifactId>social-component-core</artifactId>

diff --git a/webapp/src/main/java/org/exoplatform/webconferencing/jitsi/server/JitsiGateway.java b/webapp/src/main/java/org/exoplatform/webconferencing/jitsi/server/JitsiGateway.java
@@ -31,11 +31,11 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;