feat(project): Add Support for Tomcat 10

Highlights - The Tomcat distro outputs one tar for Tomcat 10; Tomcat 9 is not an output anymore - The CI continues to support Tomcat 9 by using the respective tomcat9 profile - The QA Module assembles Tomcat 9 and uses it for testing (webapp,engine-integration-test) using the tomcat9 profile Other Noteable Points - engine-rest supports a jakarta configuration for Tomcat CI - The commit adds two new Stages to the Main Pipeline for Tomcat 10 integration tests and webapps Related-to: #2471
camunda · Jun 20, 2024 · ccb10f9 · ccb10f9
1 parent b334ba8
commit ccb10f9
Show file tree

Hide file tree

Showing 32 changed files with 1,860 additions and 45 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -233,14 +233,33 @@ pipeline {
             cambpmConditionalRetry([
               agentLabel: 'postgresql_142',
               runSteps: {
-                cambpmRunMaven('qa/', 'clean install -Ptomcat,postgresql,engine-integration', runtimeStash: true, archiveStash: true)
+                cambpmRunMaven('qa/', 'clean install -Ptomcat9,postgresql,engine-integration', runtimeStash: true, archiveStash: true)
               },
               postFailure: {
                 cambpmPublishTestResult()
               }
             ])
           }
         }
+        stage('engine-IT-tomcat-10-postgresql-142') {
+          when {
+            expression {
+              cambpmWithLabels('all-as', 'tomcat')
+            }
+          }
+          steps {
+            cambpmConditionalRetry([
+              agentLabel: 'postgresql_142',
+              runSteps: {
+                cambpmRunMaven('qa/', 'clean install -Ptomcat,postgresql,engine-integration-jakarta', runtimeStash: true, archiveStash: true, jdkVersion: 'jdk-17-latest')
+              },
+              postFailure: {
+                cambpmPublishTestResult()
+                cambpmArchiveArtifacts('qa/tomcat-runtime/target/**/standalone/log/**')
+              }
+            ])
+          }
+        }
         stage('engine-IT-wildfly-postgresql-142') {
           when {
             expression {
@@ -339,11 +358,31 @@ pipeline {
             cambpmConditionalRetry([
               agentLabel: 'chrome_112',
               runSteps: {
-                cambpmRunMaven('qa/', 'clean install -Ptomcat,h2,webapps-integration', runtimeStash: true, archiveStash: true)
+                cambpmRunMaven('qa/', 'clean install -Ptomcat9,h2,webapps-integration', runtimeStash: true, archiveStash: true)
+              },
+              postFailure: {
+                cambpmPublishTestResult()
+                cambpmArchiveArtifacts('qa/integration-tests-webapps/shared-engine/target/selenium-screenshots/*')
+              }
+            ])
+          }
+        }
+        stage('webapp-IT-tomcat-10-h2') {
+          when {
+            expression {
+              cambpmWithLabels('webapp-integration', 'h2')
+            }
+          }
+          steps {
+            cambpmConditionalRetry([
+              agentLabel: 'chrome_112',
+              runSteps: {
+                cambpmRunMaven('qa/', 'clean install -Ptomcat,h2,webapps-integration -DskipTests-webapps=true', runtimeStash: true, archiveStash: true, jdkVersion: 'jdk-17-latest')
               },
               postFailure: {
                 cambpmPublishTestResult()
                 cambpmArchiveArtifacts('qa/integration-tests-webapps/shared-engine/target/selenium-screenshots/*')
+                cambpmArchiveArtifacts('qa/integration-tests-webapps/shared-engine/target/*')
               }
             ])
           }

diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
@@ -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>
@@ -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 {
 
 }
diff --git a/distro/tomcat/assembly/assembly.xml b/distro/tomcat/assembly/assembly.xml
@@ -53,7 +53,6 @@
         <include>org.graalvm.sdk:graal-sdk:jar:*</include>
         <include>com.ibm.icu:icu4j:jar:*</include>
         <include>org.slf4j:slf4j-api:jar:*</include>
-        <include>org.slf4j:slf4j-jdk14:jar:*</include>
 
         <include>org.camunda.bpm:camunda-engine-plugin-*:jar</include>
         <include>org.camunda.spin:camunda-spin-core*:jar</include>
@@ -95,7 +94,6 @@
         <include>org.graalvm.sdk:graal-sdk:jar:*</include>
         <include>com.ibm.icu:icu4j:jar:*</include>
         <include>org.slf4j:slf4j-api:jar:*</include>
-        <include>org.slf4j:slf4j-jdk14:jar:*</include>
 
         <include>org.camunda.bpm:camunda-engine-plugin-*:jar</include>
         <include>org.camunda.spin:camunda-spin-core*:jar</include>

diff --git a/distro/tomcat/assembly/pom.xml b/distro/tomcat/assembly/pom.xml
@@ -91,7 +91,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-cdi</artifactId>
+      <artifactId>camunda-engine-cdi-jakarta</artifactId>
     </dependency>
 
     <dependency>
@@ -108,6 +108,7 @@
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-spin</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -125,21 +126,12 @@
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-connect</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-connectors-all</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.camunda.connect</groupId>
-          <artifactId>camunda-connect-http-client</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.camunda.connect</groupId>
-          <artifactId>camunda-connect-soap-http-client</artifactId>
-        </exclusion>
-      </exclusions>
       <version>${project.version}</version>
     </dependency>
 
@@ -155,11 +147,6 @@
       <artifactId>camunda-template-engines-freemarker</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-    </dependency>
-
   </dependencies>
 
   <build>

diff --git a/distro/tomcat/distro/assembly.xml b/distro/tomcat/distro/assembly.xml
@@ -34,23 +34,23 @@
 
     <dependencySet>
         <includes>
-            <include>org.camunda.bpm:camunda-engine-rest:war:*</include>
+            <include>org.camunda.bpm:camunda-engine-rest-jakarta:war:*</include>
         </includes>
         <outputDirectory>server/apache-tomcat-${version.tomcat}/webapps/engine-rest</outputDirectory>
         <unpack>true</unpack>
     </dependencySet>
 
     <dependencySet>
         <includes>
-            <include>org.camunda.bpm.webapp:camunda-webapp-tomcat:war:*</include>
+            <include>org.camunda.bpm.webapp:camunda-webapp-tomcat-jakarta:war:*</include>
         </includes>
         <outputDirectory>server/apache-tomcat-${version.tomcat}/webapps/camunda</outputDirectory>
         <unpack>true</unpack>
     </dependencySet>
 
     <dependencySet>
         <includes>
-            <include>org.camunda.bpm.example:camunda-example-invoice:war:*</include>
+            <include>org.camunda.bpm.example:camunda-example-invoice-jakarta:war:*</include>
         </includes>
         <outputDirectory>server/apache-tomcat-${version.tomcat}/webapps/camunda-invoice</outputDirectory>
         <unpack>true</unpack>

diff --git a/distro/tomcat/distro/pom.xml b/distro/tomcat/distro/pom.xml
@@ -14,6 +14,15 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>org.camunda.bpm.distro</groupId>
+      <artifactId>camunda-sql-scripts</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+
+    <!-- Tomcat 10 dependencies -->
+
     <dependency>
       <groupId>org.camunda.bpm.tomcat</groupId>
       <artifactId>camunda-tomcat-assembly</artifactId>
@@ -22,32 +31,57 @@
     </dependency>
 
     <dependency>
-      <groupId>org.camunda.bpm.distro</groupId>
-      <artifactId>camunda-sql-scripts</artifactId>
+      <groupId>org.camunda.bpm.webapp</groupId>
+      <artifactId>camunda-webapp-tomcat-jakarta</artifactId>
       <version>${project.version}</version>
-      <type>jar</type>
+      <type>war</type>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-rest</artifactId>
+      <artifactId>camunda-engine-rest-jakarta</artifactId>
       <version>${project.version}</version>
       <classifier>tomcat</classifier>
       <type>war</type>
     </dependency>
 
+    <dependency>
+      <groupId>org.camunda.bpm.example</groupId>
+      <artifactId>camunda-example-invoice-jakarta</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+
+      <!-- Tomcat 9 dependencies -->
+
+    <dependency>
+      <groupId>org.camunda.bpm.tomcat</groupId>
+      <artifactId>camunda-tomcat-assembly</artifactId>
+      <version>${project.version}</version>
+      <type>tar.gz</type>
+    </dependency>
+
     <dependency>
       <groupId>org.camunda.bpm.webapp</groupId>
       <artifactId>camunda-webapp-tomcat</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
 
+    <dependency>
+      <groupId>org.camunda.bpm</groupId>
+      <artifactId>camunda-engine-rest</artifactId>
+      <version>${project.version}</version>
+      <classifier>tomcat</classifier>
+      <type>war</type>
+    </dependency>
+
     <dependency>
       <groupId>org.camunda.bpm.example</groupId>
       <artifactId>camunda-example-invoice</artifactId>
       <version>${project.version}</version>
       <type>war</type>
+
     </dependency>
 
   </dependencies>
@@ -59,7 +93,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>distro</id>
+            <id>distro-tomcat10</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>

diff --git a/distro/tomcat/pom.xml b/distro/tomcat/pom.xml
@@ -44,6 +44,7 @@
       <modules>
         <module>distro</module>
         <module>webapp</module>
+        <module>webapp-jakarta</module>
       </modules>
     </profile>
   </profiles>

diff --git a/distro/tomcat/webapp-jakarta/pom.xml b/distro/tomcat/webapp-jakarta/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.camunda.bpm.tomcat</groupId>
+    <artifactId>camunda-tomcat</artifactId>
+    <version>7.22.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <name>Camunda Platform - webapp - jakarta - Tomcat</name>
+  <groupId>org.camunda.bpm.webapp</groupId>
+  <artifactId>camunda-webapp-tomcat-jakarta</artifactId>
+  <packaging>war</packaging>
+
+  <properties>
+    <skip-third-party-bom>false</skip-third-party-bom>
+
+    <version.resteasy>6.2.3.Final</version.resteasy>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.camunda.bpm.webapp</groupId>
+      <artifactId>camunda-webapp-jakarta</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-core</artifactId>
+      <version>${version.resteasy}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>camunda-webapp</finalName>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>