atiaomar1978-hub commented on PR #25498: URL: https://github.com/apache/camel/pull/25498#issuecomment-5412787074
_AI-generated on behalf of atiaomar1978-hub_ Merged latest upstream `main` into `feature/CAMEL-24373-alibaba-phase3-c587` (commit `43de4eaf` + follow-up merge for `174f902`). **Conflict resolution (`parent/pom.xml`):** - Kept feature-branch `aliyun-sls-version` and `aliyun-tablestore-version` - Adopted upstream bumps for `aliyun-eventbridge-version` (7.3.0), `aliyun-eventbridge-client-version` (1.3.14), and `tea-openapi-version` (0.3.15) **Review items:** all prior @davsclaus findings were already addressed in earlier commits (region required flag, OpenApiClientSupport delegation, mock-based OTS test, alphabetical ordering, STATUS_CODE constant, listLogStores offset header collision). **Tests run locally (green):** ``` ./mvnw -pl components/camel-alibaba/camel-alibaba-ots,components/camel-alibaba/camel-alibaba-sls -am test ``` Merge conflict should now be resolved — ready for CI. -- 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]
