fatmanverse commented on PR #11436:
URL: https://github.com/apache/seatunnel/pull/11436#issuecomment-5029663474
@SEZ9 Merged the latest `dev` to clear the merge conflict (merge commit
`3f3f86c1f`).
The only conflict was in `connector-hive`'s `S3StorageTest.java`: `dev`
(#11459) had refactored that test to extract a shared
`TEST_S3_CREDENTIALS_PROVIDER` constant, while this PR had renamed the option
to `S3A_AWS_CREDENTIALS_PROVIDER_CLASS` and flattened the enum into class-name
constants — both touched the same lines.
Resolution keeps `dev`'s shared-constant structure but points it at this
PR's new API:
```java
private static final String TEST_S3_CREDENTIALS_PROVIDER =
S3FileBaseOptions.SIMPLE_AWS_CREDENTIALS_PROVIDER;
// both configs now use S3A_AWS_CREDENTIALS_PROVIDER_CLASS.key()
```
The two `S3File.md` doc conflicts auto-merged cleanly. Verified locally:
`spotless:check` clean and `S3StorageTest` green (2/2). The PR is now mergeable.
--
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]
