[backport camel-4.14.x] CAMEL-23516: camel-xmpp - Use dedicated HeaderFilterStrategy aligned with sibling components#23321
Merged
oscerd merged 1 commit intoMay 19, 2026
Conversation
…with sibling components camel-xmpp defaulted its headerFilterStrategy to a bare DefaultHeaderFilterStrategy (XmppEndpoint and the XmppBinding no-arg constructor), passing inbound XMPP message properties — including Camel* / camel* / org.apache.camel.* — straight onto the Exchange. Introduces XmppHeaderFilterStrategy (KafkaHeaderFilterStrategy / MailHeaderFilterStrategy shape) and switches both defaults to it, aligning camel-xmpp with the rest of the component catalog. Includes a unit test and the 4.21 upgrade-guide entry. Sibling of CAMEL-23515 (camel-nats). Follow-up to evaluate centralizing this in DefaultHeaderFilterStrategy is tracked as CAMEL-23543. Closes apache#23283 (cherry picked from commit 4a07498)
davsclaus
approved these changes
May 19, 2026
oscerd
added a commit
that referenced
this pull request
May 19, 2026
The camel-xmpp HeaderFilterStrategy change was backported to camel-4.14.x (#23321, merged). Per the project's backport upgrade-guide policy, the version-specific camel-4x-upgrade-guide-4_14.adoc lives canonically on main across all releases. This adds the matching === camel-xmpp section to that guide on main so the canonical history does not drift from the maintenance branch. Docs-only; no code or build impact. Closes #23325
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #23283
Cherry-pick of #23283 onto
camel-4.14.x.Original PR: #23283 - CAMEL-23516: camel-xmpp - Use dedicated HeaderFilterStrategy aligned with sibling components
Original author: @oscerd
Target branch:
camel-4.14.xConflict resolution
camel-4x-upgrade-guide-4_21.adocdoes not exist oncamel-4.14.x(modify/delete). Resolved by dropping the 4.21 change and adding the
equivalent
=== camel-xmppnote tocamel-4x-upgrade-guide-4_14.adocon this branch (right after the
=== camel-natssection from theCAMEL-23515 backport). The matching
camel-4x-upgrade-guide-4_14.adocentry on
mainis added in a separate doc-sync PR per the project'sbackport upgrade-guide policy. Code files (
XmppEndpoint,XmppBinding,new
XmppHeaderFilterStrategy+ test) cherry-picked cleanly.The
camel-xmppmodule + new unit test build cleanly oncamel-4.14.x(validated locally); the full reactor build hits the pre-existing
core/camel-xml-ioschemagen JDK 21 environment issue that also affected#23283 / #23296 and the CAMEL-23515 backports.
Original description
camel-xmppdefaulted itsheaderFilterStrategyto a barenew DefaultHeaderFilterStrategy()(inXmppEndpointand theXmppBindingno-arg constructor), passing inbound XMPP messageproperties — including
Camel*/camel*/org.apache.camel.*—onto the Exchange. Introduces
XmppHeaderFilterStrategy(following theKafkaHeaderFilterStrategy/MailHeaderFilterStrategyshape) andswitches both defaults to it, aligning
camel-xmppwith the rest of thecomponent catalog. Includes a unit test and the upgrade-guide note.
JIRA: https://issues.apache.org/jira/browse/CAMEL-23516 (fixVersions include 4.14.8)
Claude Code on behalf of Andrea Cosentino