DanielLeens commented on PR #11809: URL: https://github.com/apache/seatunnel/pull/11809#issuecomment-6538592094
Merged `dev` (`3ac2d1cec6a`) into this branch with a plain merge commit (no rebase, no force push). New head: `993f3fdbeea` (previous head `a847181373`). Only formatting was run locally (module-scoped `spotless:apply`); `git diff origin/dev --name-status` lists only this PR's own 4 files and no deletions. Conflict and resolution: - `CoordinatorService.java`: `dev` (#12460) replaced the explicit `getJobHistoryService()` with a Lombok `@Getter` on the `jobHistoryService` field, while this PR kept the explicit getter to carry its Javadoc. Resolved by keeping `dev`'s `@Getter` and moving this PR's invariant Javadoc (closing removes listeners only; reads stay valid; each activation creates a fresh instance) onto the field. The `clearCoordinatorService()` capture-then-close logic and the `initCoordinatorService()` comment are unchanged. Compile and tests are left to the fork CI run per the validation policy (queued at the time of writing, no result claimed): https://github.com/DanielLeens/seatunnel/actions/runs/41165514671 -- 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]
