Croway opened a new pull request, #30202: URL: https://github.com/apache/camel/pull/30202
# Description Adapted backport of #30200 to `camel-4.22.x`. The main PR is still open. Migrate `camel-undertow` and the affected servlet test dependencies to `io.undertow.ee:undertow-servlet:2.0.3.Final` (Jakarta Servlet 6.1). The old and new servlet artifacts have different Maven group IDs but overlapping Java packages, so combining Camel Undertow with an Undertow EE-based servlet container can otherwise put both implementations on the classpath. Adaptations for 4.22.x: - Upgrade Undertow core from 2.4.2.Final to 2.4.4.Final, matching Undertow EE 2.0.3.Final. - Preserve Java 17 source compatibility in the new asynchronous servlet/Camel consumer coexistence test; Java 17's `HttpClient` is not `AutoCloseable`. - Keep the 4.22.3 upgrade note on `main` in #30200, following the repository's backport documentation policy. The parent property for the servlet implementation changes from `undertow-servlet-version` to `undertow-ee-version`. Validation: - Built the affected modules and their prerequisites from the 4.22.x sources: 102-module reactor succeeded, using Java 25 with Java 17 compilation targets. - Full `camel-servlet` suite: 102 tests, no failures, 2 existing skips. - Full `camel-undertow` suite: 227 tests, no failures, 1 existing skip. - Focused OAuth servlet tests: 9 passed; CXF Undertow test: 1 passed. - New Servlet 6.1 regression also passed in a Java 17 test JVM, with Maven running on the required JDK 21+ build JDK. - Dependency trees and test runtime classpaths select Undertow EE 2.0.3.Final, core 2.4.4.Final, and Servlet API 6.1.0 without the old servlet artifact. - Formatting and `git diff --check` passed. # Target - [x] Targets `camel-4.22.x` for Camel 4.22.3. # Tracking - [x] https://issues.apache.org/jira/browse/CAMEL-27030 - [x] Main PR: #30200; source commit: 15c128a3f0e833d97bdf6c7bebf1980709b3ee6a. # Apache Camel coding standards and style - [x] Commit references the Jira issue and describes the backport adaptations. - [x] Built the affected modules and prerequisites, regenerated files, and ran formatting checks. # AI-assisted contributions - [x] This PR includes AI-assisted code and documentation prepared by Codex on behalf of Federico Mariani (@Croway). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
