Skip to content

Commit

Permalink
chore(project): Add Tomcat 10 Support
Browse files Browse the repository at this point in the history 
Description:

This commit can be broken down into the following changes:

- Use version.tomcat9 for tomcat 9 and version.tomcat property for tomcat 10 respectively
- Add tomcat assembly config to camunda-engine-rest-jakarta
- Add new module `camunda-tomcat-assembly-jakarta` which produces a tomcat 10 configured with the jakarta namespace
- Add configuration to produce a tomcat webapp based on the jakarta namespace
- Add configuration to tomcat distro module to output both tomcat 9 & 10 distributions

Related-to: #2471
  • Loading branch information
@psavidis
psavidis committed Apr 25, 2024
1 parent e78d544 commit fb31779
Show file tree
Hide file tree
Showing 27 changed files with 1,323 additions and 28 deletions.
177 changes: 177 additions & 0 deletions distro/tomcat/assembly-jakarta/assembly.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:maven:assembly:1.1.0-SNAPSHOT">

<id>assemble</id>

<formats>
<format>tar.gz</format>
</formats>

<includeBaseDirectory>false</includeBaseDirectory>

<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<includes>
<include>org.camunda.bpm:license-book:zip</include>
</includes>
<unpack>true</unpack>
</dependencySet>
<dependencySet>
<outputDirectory>server/</outputDirectory>
<includes>
<include>org.apache.tomcat:tomcat:tar.gz</include>
</includes>
<unpackOptions>
<excludes>
<exclude>**/conf/server.xml</exclude>
</excludes>
</unpackOptions>
<unpack>true</unpack>
</dependencySet>
<dependencySet>
<outputDirectory>server/apache-tomcat-${version.tomcat}/lib</outputDirectory>
<includes>

<include>com.h2database:h2:jar</include>

<include>org.camunda.bpm:camunda-engine:jar</include>
<include>org.camunda.bpm.identity:camunda-identity-ldap:jar</include>

<include>org.mybatis:mybatis:jar:*</include>
<include>com.fasterxml.uuid:java-uuid-generator:jar:*</include>
<include>joda-time:joda-time:jar:*</include>
<include>org.codehaus.groovy:groovy:jar:*</include>
<include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
<include>org.codehaus.groovy:groovy-json:jar:*</include>
<include>org.codehaus.groovy:groovy-xml:jar:*</include>
<include>org.codehaus.groovy:groovy-templates:jar:*</include>
<include>org.graalvm.js:*</include>
<include>org.graalvm.regex:regex:jar:*</include>
<include>org.graalvm.truffle:truffle-api:jar:*</include>
<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:*:jar</include>
<include>org.camunda.connect:*:jar</include>
<include>org.camunda.commons:*:jar</include>

<include>org.camunda.bpm.model:*:jar</include>
<include>org.camunda.bpm.dmn:*:jar</include>
<include>org.camunda.bpm.juel:*:jar</include>

<include>org.camunda.feel:*:jar</include>

<include>org.freemarker:*:jar</include>
<include>org.camunda.template-engines:*:jar</include>
</includes>
</dependencySet>

<dependencySet>
<outputDirectory>lib/</outputDirectory>
<includes>

<include>com.h2database:h2:jar</include>

<include>org.camunda.bpm:camunda-engine:jar</include>
<include>org.camunda.bpm.identity:camunda-identity-ldap:jar</include>

<include>org.mybatis:mybatis:jar:*</include>
<include>com.fasterxml.uuid:java-uuid-generator:jar:*</include>
<include>joda-time:joda-time:jar:*</include>
<include>org.codehaus.groovy:groovy:jar:*</include>
<include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
<include>org.codehaus.groovy:groovy-json:jar:*</include>
<include>org.codehaus.groovy:groovy-xml:jar:*</include>
<include>org.codehaus.groovy:groovy-templates:jar:*</include>
<include>org.graalvm.js:*</include>
<include>org.graalvm.regex:regex:jar:*</include>
<include>org.graalvm.truffle:truffle-api:jar:*</include>
<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:*:jar</include>
<include>org.camunda.connect:*:jar</include>
<include>org.camunda.commons:*:jar</include>

<include>org.camunda.bpm.model:*:jar</include>

<include>org.camunda.bpm.dmn:*:jar</include>

<include>org.camunda.feel:*:jar</include>

<include>org.freemarker:*:jar</include>
<include>org.camunda.template-engines:*:jar</include>
</includes>
</dependencySet>
</dependencySets>

<files>
<file>
<source>src/README.txt</source>
<filtered>true</filtered>
<lineEnding>crlf</lineEnding>
<outputDirectory></outputDirectory>
</file>
<file>
<source>../../license/LICENSE</source>
<filtered>true</filtered>
<lineEnding>crlf</lineEnding>
<outputDirectory></outputDirectory>
</file>
<file>
<source>../../license/NOTICE</source>
<filtered>true</filtered>
<lineEnding>crlf</lineEnding>
<outputDirectory></outputDirectory>
</file>
<file>
<source>src/start-camunda.bat</source>
<filtered>true</filtered>
<outputDirectory></outputDirectory>
</file>
<file>
<source>src/start-camunda.sh</source>
<filtered>true</filtered>
<outputDirectory></outputDirectory>
<fileMode>0755</fileMode>
</file>
<file>
<source>src/shutdown-camunda.bat</source>
<filtered>true</filtered>
<outputDirectory></outputDirectory>
</file>
<file>
<source>src/shutdown-camunda.sh</source>
<filtered>true</filtered>
<outputDirectory></outputDirectory>
<fileMode>0755</fileMode>
</file>

<file>
<source>src/conf/server.xml</source>
<outputDirectory>server/apache-tomcat-${version.tomcat}/conf/</outputDirectory>
</file>

<file>
<source>src/conf/bpm-platform.xml</source>
<outputDirectory>server/apache-tomcat-${version.tomcat}/conf/</outputDirectory>
</file>

<file>
<source>src/tomcat/setenv.bat</source>
<outputDirectory>server/apache-tomcat-${version.tomcat}/bin/</outputDirectory>
</file>
<file>
<source>src/tomcat/setenv.sh</source>
<outputDirectory>server/apache-tomcat-${version.tomcat}/bin/</outputDirectory>
</file>
</files>
</assembly>
178 changes: 178 additions & 0 deletions distro/tomcat/assembly-jakarta/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
<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">
<modelVersion>4.0.0</modelVersion>

<description>
Assembles the Camunda Platform and makes it ready for qa.
The assembly is installed to maven later in the reactor, if the integration tests pass sucessfully
</description>

<artifactId>camunda-tomcat-assembly-jakarta</artifactId>
<packaging>pom</packaging>

<parent>
<groupId>org.camunda.bpm.tomcat</groupId>
<artifactId>camunda-tomcat</artifactId>
<version>7.22.0-SNAPSHOT</version>
</parent>

<properties>
<skip-third-party-bom>false</skip-third-party-bom>
</properties>

<name>Camunda Platform - tomcat Assembly</name>

<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<version>${version.tomcat}</version>
<type>tar.gz</type>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>

<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.uuid</groupId>
<artifactId>java-uuid-generator</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-json</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-templates</artifactId>
</dependency>

<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js-scriptengine</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine-cdi</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.bpm.identity</groupId>
<artifactId>camunda-identity-ldap</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.spin</groupId>
<artifactId>camunda-spin-core</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine-plugin-spin</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.spin</groupId>
<artifactId>camunda-spin-dataformat-all</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.connect</groupId>
<artifactId>camunda-connect-core</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine-plugin-connect</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.connect</groupId>
<artifactId>camunda-connect-connectors-all</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>license-book</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>

<dependency>
<groupId>org.camunda.template-engines</groupId>
<artifactId>camunda-template-engines-freemarker</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>assemble</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<attach>true</attach>
<appendAssemblyId>false</appendAssemblyId>
<outputDirectory>target/</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit fb31779

Please sign in to comment.