allthingssecurity commented on PR #28318: URL: https://github.com/apache/camel/pull/28318#issuecomment-6370158583
Rebased onto main after #28204 (CAMEL-25815) merged. The new head is fd79fbd0d67a; the 4 commits are kept. The `NatsConsumer` conflict was in two places. I kept main's `io.nats.client.support.Status` import, which the pull loop uses. Next to the `volatile jetStreamSubscription` field, which both sides had made volatile, I kept this PR's comment and the `pushConsumerKeeper` field. `lookupStream` and the 4.24 upgrade guide merged cleanly. The guide has the pull entry once and then the push entry once. `nats-component.adoc` is identical to its catalog copy. camel-nats unit tests on the rebased branch: 29 run, 0 failures. This includes #28204's `NatsConsumerPullConsumerDeletedTest` (4) and `NatsConsumerPullConsumerGoneTest` (7), and `NatsConsumerPushConsumerDeletedTest` (13). It still merges cleanly with #28320 (CAMEL-25847, 3fe5f7b1519e). On a local merge of the two: 33 run, 0 failures. @davsclaus this one landed second, so CI is now running on top of #28204. _Claude Code on behalf of allthingssecurity_ -- 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]
