[gnodet]

Backport of #28297

Cherry-pick of f4ea671 to camel-4.22.x.
Conflicts resolved automatically by backport bot agent.

[davsclaus]

TL;DR

Comment: the OAuth hunks match #28297, but this backport depends on CAMEL-25917 (#28237), which is not on camel-4.22.x yet.

Blockers

• UndertowWsOAuthProfileConsumerChangeTest.java:72 waits for the first channel to be closed after the consumer changes. On main that close comes from closePeersThatNoLongerPassChecks(), which setConsumer calls (added by #28237). On camel-4.22.x setConsumer (CamelWebSocketHandler.java:402) closes nothing, so the test is expected to time out after 10 s.
• The conflict resolution added a consumer field to HandshakeResult (CamelWebSocketHandler.java:685) that nothing reads on this branch. On main its reader also comes from #28237.

Suggested fix: backport #28237 to camel-4.22.x first, then cherry-pick #28297 again.

Reviewed with Claude Code on behalf of davsclaus. This review was generated by an AI agent and may contain inaccuracies; please verify all suggestions before applying.

[github-actions]

🌟 Thank you for your contribution to the Apache Camel project! 🌟
🤖 CI automation will test this PR automatically.

🐫 Apache Camel Committers, please review the following items:

• First-time contributors require MANUAL approval for the GitHub Actions to run
• You can use the command /component-test (camel-)component-name1 (camel-)component-name2.. to request a test from the test bot although they are normally detected and executed by CI.
• You can label PRs using skip-tests and test-dependents to fine-tune the checks executed by this PR.
• Build and test logs are available in the summary page. Only Apache Camel committers have access to the summary.

⚠️ Be careful when sharing logs. Review their contents before sharing them publicly.

[github-actions]

🧪 CI tested the following changed modules:

• components/camel-undertow

ℹ️ Dependent modules were not tested because the total number of affected modules exceeded the threshold (50). Use the test-dependents label to force testing all dependents.

---

🔬 Scalpel shadow comparison — Scalpel: 38 tested, 29 compile-only — current: 38 all tested

Maveniverse Scalpel detected 67 affected modules (current approach: 38).

⚠️ Modules only in Scalpel (29)

• apache-camel
• camel-allcomponents
• camel-catalog
• camel-catalog-console
• camel-catalog-lucene
• camel-catalog-maven
• camel-catalog-suggest
• camel-componentdsl
• camel-csimple-maven-plugin
• camel-endpointdsl
• camel-endpointdsl-support
• camel-itest
• camel-jbang-core
• camel-jbang-it
• camel-jbang-main
• camel-jbang-plugin-edit
• camel-jbang-plugin-generate
• camel-jbang-plugin-kubernetes
• camel-jbang-plugin-test
• camel-kamelet-main
• camel-launcher
• camel-report-maven-plugin
• camel-route-parser
• camel-yaml-dsl
• camel-yaml-dsl-deserializers
• camel-yaml-dsl-maven-plugin
• coverage
• docs
• dummy-component

Skip-tests mode would test 38 modules (1 direct + 37 downstream), skip tests for 29 (generated code, meta-modules)

Modules Scalpel would test (38)

• camel-a2a
• camel-consul
• camel-cxf-rest
• camel-cxf-soap
• camel-cxf-spring-rest
• camel-cxf-spring-soap
• camel-cxf-spring-transport
• camel-cxf-transport
• camel-jbang-mcp
• camel-jbang-plugin-mcp
• camel-jbang-plugin-route-parser
• camel-jbang-plugin-tui
• camel-jbang-plugin-validate
• camel-jsonpath
• camel-knative-http
• camel-launcher-container
• camel-lra
• camel-mcp-server
• camel-micrometer-observability
• camel-micrometer-prometheus
• camel-oauth
• camel-observability-services
• camel-openapi-validator
• camel-opentelemetry
• camel-opentelemetry2
• camel-platform-http-main
• camel-platform-http-vertx
• camel-rest-openapi
• camel-slack
• camel-soap
• camel-telemetry
• camel-telemetry-dev
• camel-undertow
• camel-undertow-spring-security
• camel-vertx-http
• camel-yaml-dsl-validator
• camel-yaml-dsl-validator-maven-plugin
• camel-zookeeper

Modules with tests skipped (29)

• apache-camel
• camel-allcomponents
• camel-catalog
• camel-catalog-console
• camel-catalog-lucene
• camel-catalog-maven
• camel-catalog-suggest
• camel-componentdsl
• camel-csimple-maven-plugin
• camel-endpointdsl
• camel-endpointdsl-support
• camel-itest
• camel-jbang-core
• camel-jbang-it
• camel-jbang-main
• camel-jbang-plugin-edit
• camel-jbang-plugin-generate
• camel-jbang-plugin-kubernetes
• camel-jbang-plugin-test
• camel-kamelet-main
• camel-launcher
• camel-report-maven-plugin
• camel-route-parser
• camel-yaml-dsl
• camel-yaml-dsl-deserializers
• camel-yaml-dsl-maven-plugin
• coverage
• docs
• dummy-component

ℹ️ Shadow mode — Scalpel observes but does not affect test execution. Learn more

---

⚙️ View full build and test results

[davsclaus]

@gnodet the CAMEL-25917 fix this backport depends on is now on camel-4.22.x (#28505, 890bf42). Could this branch be rebased onto camel-4.22.x? That should clear the merge conflict and let UndertowWsOAuthProfileConsumerChangeTest pass. CI then needs a new run.

Claude Code on behalf of davsclaus