Nikk8091 commented on PR #12958: URL: https://github.com/apache/seatunnel/pull/12958#issuecomment-6681458449
Merged current dev `df59bb4cd1c1fef7f2c38ade6456b8c0c2658da8` to resolve the new merge conflicts. Updated head: `c7e0a519ead8d61c1bbfd51b19b0723e0bbfb805`. The conflicts were limited to the EN/ZH REST API pages. Both upstream's OpenAPI contract introduction and this PR's request-body charset section are retained, with the general OpenAPI introduction before the charset subsection. REST production code and tests needed no manual conflict resolution. The PR diff against dev remains seven files. Fresh validation on JDK 11 passed: the 40-module engine-server reactor completed `spotless:apply verify`, and all 72 selected tests passed with zero failures, errors or skips. Coverage includes the 40 charset/config-shade cases, adjacent servlet/query/content-type/authentication/savepoint tests, and the new OpenAPI route-sync tests. `git diff --check upstream/dev...HEAD` passed. ```sh mvn -o -B -ntp -pl seatunnel-engine/seatunnel-engine-server -am -Dtest=RestApiSubmitJobConfigShadeDecryptTest,BaseServletTest,ExceptionHandlingFilterTest,OptionRulesApiTest,RestApiHttpBasicTest,RestApiSubmitJobStartWithSavePointTest,BaseServletQueryParameterTest,RestApiSubmitJobContentTypeTest,TestOpenApiV2RouteSync -Dsurefire.failIfNoSpecifiedTests=false -DskipIT=true -Dskip.ui=true spotless:apply verify ``` Docker-backed integration tests were not run locally. The resolved branch is pushed for fresh 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]
