WMK666666 commented on PR #29594: URL: https://github.com/apache/camel/pull/29594#issuecomment-6823715092
Rebased on main (`14e39d4`), on top of `fe2f3ce`. `DoclingProducer.java` merged cleanly with #29595's `OcrSettings` refactor: the `html_split_page` rejection and the package-private `mapToOutputFormat` sit below `resolveOcrSettings` and were not touched by it. `DoclingContentExtractor.java` is unchanged on main. The only conflict was, as you predicted, the 4.24 upgrade guide. It now carries three `camel-docling` sections in merge order — `apiKeyHeader` (from #29591), the OCR headers (from #29595), then `html_split_page` (this PR) — with a blank line between them. The diff is unchanged by the rebase, which is how I checked nothing was lost: `+188/-2` over the same five files (`DoclingProducer.java` +15/−2, `DoclingContentExtractor.java` +5, the two tests +81/+80, the guide +7), one commit on top of `fe2f3ce`, `mergeable=True`. CI will need another approval for `14e39d4`; 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]
