Nikk8091 commented on PR #12958: URL: https://github.com/apache/seatunnel/pull/12958#issuecomment-6520611523
Merged dev at 3ac2d1ce to resolve the newly reported conflicts. New head: 9fb213751c182feeafd147edebbeab55bd4a77f2. The conflicts were confined to the EN/ZH incompatible-changes pages, where both branches added a section below the dev heading. Both the REST charset migration notes and upstream JDBC transaction-loss notes are retained. No REST production or test behavior was changed during conflict resolution; the PR diff against dev remains seven files. Validation on the updated tree with JDK 11: - Formatting and the selected engine-server reactor build passed (40 modules). - 69 selected REST tests passed, with zero failures, errors or skips, including all 40 charset/config-shade cases and the adjacent query-parameter, content-type, authentication and savepoint tests. - The PR diff passes git diff --check. Command: ```sh mvn -o -B -ntp -pl seatunnel-engine/seatunnel-engine-server -am -Dtest=RestApiSubmitJobConfigShadeDecryptTest,BaseServletTest,ExceptionHandlingFilterTest,OptionRulesApiTest,RestApiHttpBasicTest,RestApiSubmitJobStartWithSavePointTest,BaseServletQueryParameterTest,RestApiSubmitJobContentTypeTest -Dsurefire.failIfNoSpecifiedTests=false -DskipIT=true -Dskip.ui=true spotless:apply install ``` Docker-backed integration tests were not run locally. The new commit has been pushed for CI; the previous head's green Build is not a result for this new head. -- 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]
