cloudbase-ai commented on PR #7500: URL: https://github.com/apache/shenyu/pull/7500#issuecomment-6077112590
Resolved all 11 conflicted files against master e24fb005f in merge commit 1a095e39e. Preserved the prior H2 seed fix, the upstream plugin cutovers and RabbitMQ CI scheduling fix, and the Agent Gateway version resource. Combined EnumServiceImpl filters so both Hystrix and Casdoor remain excluded from the Admin plugin enum list. Six-dialect static inspection confirms only Casdoor-owned SQL statements are removed relative to master, all other SQL is preserved and no orphan namespace relations remain. Changed POM XML parses and git diff --check passes. The previous CI failure at https://github.com/apache/shenyu/actions/runs/37885804565/job/113676515613 was a RocketMQ access-log consumption timeout (1 of 4 tests failed); its root cause is not established by the inspected logs and is not claimed fixed by this conflict resolution. No compilation, tests or CI reruns were performed; the new CI result remains unverified. -- 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]
