chore(clients): Make external-task-client use Tomcat 10

camunda · Jun 17, 2024 · fd7a58b · fd7a58b
1 parent a5a0005
commit fd7a58b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
@@ -16,7 +16,7 @@
   <properties>
     <version.httpclient>5.3</version.httpclient>
     <engine.runtime>${project.build.directory}/camunda-tomcat</engine.runtime>
-    <tomcat.runtime>${engine.runtime}/server/apache-tomcat-${version.tomcat9}</tomcat.runtime>
+    <tomcat.runtime>${engine.runtime}/server/apache-tomcat-${version.tomcat}</tomcat.runtime>
     <http.port>${tomcat.connector.http.port}</http.port>
 
     <tomcat.connector.http.port>48080</tomcat.connector.http.port>
@@ -123,7 +123,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm.tomcat</groupId>
-      <artifactId>camunda-tomcat-assembly</artifactId>
+      <artifactId>camunda-tomcat-assembly-jakarta</artifactId>
       <version>${project.version}</version>
       <type>tar.gz</type>
       <scope>test</scope>
@@ -137,7 +137,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-rest</artifactId>
+      <artifactId>camunda-engine-rest-jakarta</artifactId>
       <scope>test</scope>
       <type>war</type>
       <classifier>tomcat</classifier>
@@ -211,7 +211,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.camunda.bpm.tomcat</groupId>
-                  <artifactId>camunda-tomcat-assembly</artifactId>
+                  <artifactId>camunda-tomcat-assembly-jakarta</artifactId>
                   <version>${project.version}</version>
                   <type>tar.gz</type>
                   <outputDirectory>${engine.runtime}</outputDirectory>
@@ -262,7 +262,7 @@
           <!-- Container configuration -->
           <container>
             <type>installed</type>
-            <containerId>tomcat9x</containerId>
+            <containerId>tomcat10x</containerId>
             <append>false</append>
             <home>${tomcat.runtime}</home>
             <timeout>${cargo.timeout}</timeout>
@@ -288,7 +288,7 @@
           <deployables>
             <deployable>
               <groupId>org.camunda.bpm</groupId>
-              <artifactId>camunda-engine-rest</artifactId>
+              <artifactId>camunda-engine-rest-jakarta</artifactId>
               <type>war</type>
               <classifier>tomcat</classifier>
               <pingURL>

diff --git a/clients/java/qa/engine-variable-test/pom.xml b/clients/java/qa/engine-variable-test/pom.xml
@@ -22,9 +22,9 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.0</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/clients/java/qa/engine-variable-test/src/main/java/org/camunda/qa/Application.java b/clients/java/qa/engine-variable-test/src/main/java/org/camunda/qa/Application.java
@@ -17,12 +17,12 @@
 package org.camunda.qa;
 
 import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
+import org.camunda.bpm.application.impl.JakartaServletProcessApplication;
 
 /**
  * @author Tassilo Weidner
  */
 @ProcessApplication
-public class Application extends ServletProcessApplication {
+public class Application extends JakartaServletProcessApplication {
 
 }