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

Meeds-io · Aug 29, 2023 · 14a99f4 · 14a99f4
1 parent 9788657
commit 14a99f4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/packaging/plf-assemblies/src/main/resources/assemblies/plf-copy-libraries-component.xml b/packaging/plf-assemblies/src/main/resources/assemblies/plf-copy-libraries-component.xml
@@ -50,11 +50,11 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <!-- These old versions of eXo portal are in conflict with new ones under org.exoplatform.gatein.portal -->
         <exclude>org.exoplatform.portal:*:*</exclude>
         <!-- Servlet API are provided by the app server. It shouldn't come from a project -->
-        <exclude>javax.servlet:*</exclude>
+        <exclude>jakarta.servlet:*</exclude>
         <!-- Avoid javax.websocket-api.jar should be provided by container -->
         <exclude>*:javax.websocket-api</exclude>
         <exclude>com.google.gwt:gwt-user:*</exclude>
-        <exclude>javax.servlet.jsp:*</exclude>
+        <exclude>jakarta.servlet.jsp:*</exclude>
         <!-- Testing stuffs should never come here -->
         <exclude>junit:*</exclude>
         <exclude>org.testng:*</exclude>

diff --git a/packaging/plf-dependencies/pom.xml b/packaging/plf-dependencies/pom.xml
@@ -117,8 +117,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <artifactId>commons-testing</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>io.swagger.core.v3</groupId>

diff --git a/packaging/plf-tomcat-resources/pom.xml b/packaging/plf-tomcat-resources/pom.xml
@@ -61,8 +61,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <artifactId>plf-tomcat-pc-creator-listener</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

diff --git a/services/plf-community-edition-service/pom.xml b/services/plf-community-edition-service/pom.xml
@@ -39,8 +39,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

diff --git a/services/plf-tomcat-pc-creator-listener/pom.xml b/services/plf-tomcat-pc-creator-listener/pom.xml
@@ -40,8 +40,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>io.swagger.core.v3</groupId>

diff --git a/webapps/plf-tomcat-integration-webapp/pom.xml b/webapps/plf-tomcat-integration-webapp/pom.xml
@@ -37,8 +37,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <groupId>org.apache.tomcat</groupId>
         </exclusion>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>