Skip to content

[backport camel-4.18.x] CAMEL-25918: camel-as2 - consumers sharing a port use their own asynchronous MDN settings - #28348

Open
gnodet wants to merge 1 commit into
camel-4.18.xfrom
backport/28274-to-camel-4.18.x
Open

gnodet wants to merge 1 commit into
camel-4.18.xfrom
backport/28274-to-camel-4.18.x

Conversation

@gnodet

@gnodet gnodet commented Oct 23, 2026

Copy link
Copy Markdown
Contributor

Backport of #28274

Cherry-pick of cb73720 to camel-4.18.x.
Conflicts resolved automatically by backport bot agent.

…port use their own asynchronous MDN settings
@gnodet gnodet added the backport indicate that a Pull request is a backport from a fix from the main branch label Oct 23, 2026

@davsclaus davsclaus left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TL;DR

The Java change is a correct adaptation of #28274, but the conflict resolution damaged the generated JSON and the docs, and CI fails.

Blockers

  • Both generated as2.json files (the component copy and the catalog copy, line 85) end the validateSigningCertificateChain entry with " }), which is not valid JSON. Line 70 (asyncMdnAllowedHosts) also misses the new sentence from AS2Configuration. Together with the two blank lines at AS2ServerConnection.java:90-91, this makes CI fail at "Fail if there are uncommitted changes". Please run the regen build for camel-as2 and commit the result, instead of editing the JSON by hand.
  • as2-component.adoc:105 ends with a stray ): "They are per port, not per consumer.)". Line 104 also says sslContext is used "for the https delivery of asynchronous MDNs". On camel-4.18.x AS2AsynchronousMDNManager refuses https, so sslContext is used for the TLS listener only.

Other findings: 3

Missing upgrade note. This backport adds no 4.18.6 note, but #28274 says the backports add the same note to the 4.22 and 4.18 guides on main. The change matters to 4.18.x users too: for example, a consumer without its own asyncMdnAllowedHosts no longer inherits the first consumer's list. Please add the note under "Upgrading from 4.18.5 to 4.18.6" (camel-4x-upgrade-guide-4_18.adoc:14), on this branch and on main.

Extra docs. as2-component.adoc:54-97 adds the whole == Usage section with the YAML example from CAMEL-25736 (#28026), which is not on this branch. It also comes after include::spring-boot:partial$starter.adoc[] (line 52), so it renders after the Spring Boot section. Please keep only the two new paragraphs and place them above the Spring Boot include.

Small point. AS2ServerConnection.java:628: the constructor body now starts with a blank line, where the asyncMdnAllowedHosts assignment was.

The call site in AS2ServerConnection is a good adaptation: it keeps the 4.18.x code in place and calls the existing 9-argument constructor. The new tests compiled in the CI regen step, but the test step did not run after the failure.


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.

@davsclaus

Copy link
Copy Markdown
Contributor

@gnodet friendly ping: CI still fails its uncommitted-changes check. The conflict resolution damaged the generated as2.json files and the docs, so they need to be regenerated (see the review from 2026-10-23).

Claude Code on behalf of davsclaus

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport indicate that a Pull request is a backport from a fix from the main branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants