Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tomcat10 support latest master #4342

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

Conversation

psavidis
Copy link
Contributor

@psavidis psavidis commented May 14, 2024

Related-to: #2471

@psavidis psavidis added the ci:tomcat Runs the builds for the Tomcat application server. label May 14, 2024
@psavidis psavidis self-assigned this May 14, 2024
@yanavasileva yanavasileva added ci:all-as Runs the builds for all application servers. ci:spring-boot Runs the integration tests for the Spring Boot starter. ci:webapp-integration Runs the webapp integration builds. labels May 14, 2024
@psavidis psavidis added ci:skipTests Skips tests execution in Assembly and Distro-ee stages. labels May 15, 2024
@yanavasileva yanavasileva removed ci:all-as Runs the builds for all application servers. ci:spring-boot Runs the integration tests for the Spring Boot starter. ci:skipTests Skips tests execution in Assembly and Distro-ee stages. labels May 17, 2024
@psavidis psavidis added the ci:skipTests Skips tests execution in Assembly and Distro-ee stages. label May 21, 2024
@psavidis psavidis force-pushed the tomcat10_support_latest_master branch 4 times, most recently from 52127f5 to e64463e Compare May 23, 2024 15:09
@psavidis psavidis removed ci:skipTests Skips tests execution in Assembly and Distro-ee stages. ci:webapp-integration Runs the webapp integration builds. labels May 24, 2024
@psavidis psavidis force-pushed the tomcat10_support_latest_master branch from 487eddf to b7b7328 Compare May 29, 2024 06:20
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
Renames include:

- References in tomcat 9 xml config
- The runtime directory (to differentiate it from latest tomcat)
- tomcat 9 maven profiles
- Tomcat 10 starts on QA Tests and then SLF4J clashes
- Add Tomcat 10 (not finished) profile for shared-engine
- Filter spin core and dataform artifacts for jakarta assembly
- Fix jakarta dependency in qa/tomcat-runtime
Other noteable changes:

- same resteasy version for jakarta webapp, engine-rest

Resteasy starts during webapp-integration tests against tomcat 10 but tomcat logs of the engine do not appear.
As a result, the engine does not start correctly and the tests get a timeout against the rest health check
The Servlet Parameter for registering the Application was wrong. Changed it to use the jakarta namespace.
- Replaces the weld-servlet-shaded with the core artifact and includes all the jakarta API dependencies in the shrinkwrap wars
- see DeploymentHelper

- The above fixes weld exception messages in the logs
- Add flag that skips the surefire unit tests of the integration-tests module
- Use the flag upon calling the webapp integration tests for tomcat 10
@psavidis psavidis force-pushed the tomcat10_support_latest_master branch from b7b7328 to 75af30a Compare May 29, 2024 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:tomcat Runs the builds for the Tomcat application server.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants