qqeasonchen opened a new pull request, #5332: URL: https://github.com/apache/eventmesh/pull/5332
## Summary Corrects the commit author attribution for two prior squash-merged PRs (#5330 and #5331) by re-applying the same content with the original PR authors preserved. ## Why The two squash-merged PRs landed on `develop` with `qqeasonchen` as the commit author: - **#5330** (merge commit `c7de75b`): barrier fix in `UniIngressService.java` for the RocketMQ 5 POP broker ACK (#5295). Original implementation by **@zhang-arvin** in #5316. - **#5331** (merge commit `4c3e85b`): 0-diff README anchor cleanup. Original PR by **@wangyusheng1985** in #5325. Squash merging puts the merger's identity on the resulting commit, which means zhang-arvin and wangyusheng1985 don't get credit in the GitHub contributor graph for their actual contributions. ## What this PR does Three plumbing commits on top of the current `develop` (4c3e85b): 1. **Revert** of c7de75b + 4c3e85b (one combined revert, authored by qqeasonchen, content net-zero) — returns the source tree to the pre-#5330 state. 2. **fix(#5295) barrier** (author = zhang-arvin, content = same UniIngressService.java barrier fix) — re-applies the original PR #5316 content with proper attribution. 3. **Fix broken README anchors** (author = wangyusheng1985, content = same 0-diff README) — re-applies the original PR #5325 with proper attribution. ## Net effect - `UniIngressService.java`: barrier fix (LOAD_BALANCE / BROADCAST / MULTICAST all gate broker ACK on the last required client ACK) — **same as #5330**. - `README.md`: unchanged from `2b0d7abb` — **same as #5331**. - The PR is a metadata-only correction: no functional change to runtime behavior. ## Commit chain ``` 2b0d7abb1 docs: downgrade Connector Runtime Beta -> Experimental (#5329) 4c3e85b49 Fix broken Quick start README anchors (#5331) <- to be superseded c7de75b39 fix(#5295): gate RocketMQ 5 POP broker ACK (#5330) <- to be superseded 7e0605bd* Revert (qqeasonchen) -> tree back to 2b0d7abb 8bb70e84* fix(#5295) barrier (author = zhang-arvin, Co-authored-by trailer) 623c12a4* README anchors (author = wangyusheng1985, Co-authored-by trailer) ``` ## Merge strategy Please use **"Create a merge commit"** (`--merge`) rather than "Squash and merge" — squash would replace the carefully-set author fields with the merger's identity again. ## Validation - `git diff 4c3e85b 623c12a4 -- eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/ingress/UniIngressService.java` → empty (barrier already in 4c3e85b's tree, preserved by re-application) - `git diff 4c3e85b 623c12a4 -- README.md` → empty (README unchanged across the chain) - Local build: `gradle :eventmesh-runtime:compileJava` already passed for the same UniIngressService.java content (#5330 verification) ## Credit - @zhang-arvin (PR #5316) — POP broker ACK barrier logic - @wangyusheng1985 (PR #5325) — README anchor cleanup - @qqeasonchen — rebase plumbing, revert commit, this PR Closes #5330, #5331 Reopens #5316, #5325 (so the original PRs can be re-filed by their authors against the new history if desired) -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
