gnodet opened a new pull request, #28695:
URL: https://github.com/apache/camel/pull/28695

   ## Backport of #28214
   
   Cherry-pick of 5ab8a591b5465b95a2239e48923cbfc58db701b1 to camel-4.18.x.
   Conflicts resolved automatically by backport bot agent.
   
   ### Conflict resolution notes
   
   - **`AbstractSftpConsumer`** (new in main's `camel-ftp-common` module): does 
not exist in 4.18.x where `SftpConsumer` and `MinaSftpConsumer` extend 
`RemoteFileConsumer` directly. The symlink resolution logic 
(`isWithinStartingDirectory`, `isUnresolvableLink`, `resolveSymbolicLinks`) was 
added directly to both `SftpConsumer` and `MinaSftpConsumer`.
   - **`SftpSymbolicLinkOperations`**: placed in `camel-ftp` (not 
`camel-ftp-common` which doesn't exist in 4.18.x).
   - **Catalog `.adoc` files**: removed (auto-generated, not present in 4.18.x).
   - **`camel-4x-upgrade-guide-4_24.adoc`**: removed (not applicable to 4.18.x).
   - **`MinaSftpOperationsDisconnectTest`**: kept only the 
`testIsTransportErrorClassification` test (the disconnect tests are from 
CAMEL-24273, not in 4.18.x).
   - **`RemoteFileConsumerStartingDirectoryJailTest`**: uses 
`junit5.CamelTestSupport` (4.18.x) instead of `junit6` (main), references 
`SftpConsumer` instead of `AbstractSftpConsumer`.


-- 
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]

Reply via email to