WMK666666 commented on PR #29595: URL: https://github.com/apache/camel/pull/29595#issuecomment-6818610736
Rebased on main (`de03c2d`). The only conflict was where you said: the end of the `camel-docling` section of `camel-4x-upgrade-guide-4_24.adoc`, because #29591 appended its `apiKeyHeader` entry there. Both entries are kept — the `apiKeyHeader` one first, then the OCR headers one — with a blank line between them. `DoclingProducer.java` merged cleanly, and it did have something to merge: #29593 added the `BearerTokenDoclingServeClient` selection and `getDoclingServeApi()`, which now sit above `resolveOcrSettings`. That is the only difference between the rebased file and the one you approved. The diff is unchanged by the rebase, which is the check I used to confirm nothing was lost: `+339/-35` over the same three files (`DoclingProducer.java` +131/-35, `DoclingOcrHeadersTest.java` +196, the upgrade guide +12), one commit on top of `009cff12`. CI will need another approval for the new commit; nothing else has changed. -- 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]
