oscerd commented on PR #27442: URL: https://github.com/apache/camel/pull/27442#issuecomment-6017034964
Confirming the diagnosis so the fix is unambiguous: The fory change itself is correct and self-contained — a single commit (`bba9d37`) adding `security = "insecure:serialization"` with `insecureValue = "false"` to the `requireClassRegistration` option on `ForyDataFormat` (6 fory-only files: the component + core-model data format and their regenerated metadata). @Croway yes — it needs a rebase off `main`. The branch `fix/CAMEL-25226` currently also carries **6 `CAMEL-24781` camel-kafka commits** (the exactly-once work from #26557), which is why the PR shows ~12 unrelated kafka files and reports as CONFLICTING. The fix is to rebuild the branch so it contains only the fory commit — cherry-pick `bba9d37` onto a fresh `main` (dropping the 6 kafka commits), regenerate, and force-push — after which `@davsclaus`'s point stands with nothing further needed on the fory code. I'm not force-pushing the branch from here, to avoid clobbering concurrent work on it; flagging the exact cause (just the stray kafka commits to drop — nothing in the fory change) so whoever rebuilds it has a clean path. _Claude Code on behalf of oscerd_ -- 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]
