Commit Graph

12036 Commits

Author SHA1 Message Date
Artem Bilan
384bb2bc2c GH-9937: Remove logger.error from the TcpSendingMessageHandler
Fixes: #9937
Issue link: https://github.com/spring-projects/spring-integration/issues/9937

The `TcpSendingMessageHandler` throws exceptions to the caller this or other way.
There is just no reason to have extra `logger.error()` in those cases

(cherry picked from commit fe5b12d98b)
2025-04-01 19:17:10 +00:00
Spring Builds
9711fd6160 [artifactory-release] Next development version 2025-03-18 17:53:33 +00:00
Spring Builds
5ae261bc3c [artifactory-release] Release version 6.3.9 2025-03-18 17:53:32 +00:00
Artem Bilan
8cabdfe3b6 The main reusable workflows for GHAs with build 2025-03-18 12:55:37 -04:00
Artem Bilan
0fe58fd699 GH-9909: Fix SftpSession for shared client
Fixes: #9909
Issue link: https://github.com/spring-projects/spring-integration/issues/9909

The `SftpSession.close()` closes `sftpClient` and its `clientSession` unconditionally.
At the same time the `DefaultSftpSessionFactory.isSharedSession` is expected to expose only a single shared client.
When this `DefaultSftpSessionFactory` is used concurrently, there is a chance that one thread would close
that shared client and another won't be able to interact due to `clientSession` is closed.

* Fix `SftpSession` accepting an `isSharedClient` flag and doing nothing in the `close()` if client is shared.
* Propagate `isSharedSession` state down to the `SftpSession` from the `DefaultSftpSessionFactory`
* Closed shared client and its `clientSession` in the `DefaultSftpSessionFactory.destroy()`

(cherry picked from commit 2df9611dde)

# Conflicts:
#	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java
2025-03-18 12:54:20 -04:00
dependabot[bot]
f901759cc5 Bump org.springframework.amqp:spring-amqp-bom from 3.1.9 to 3.1.10 (#9918)
Bumps [org.springframework.amqp:spring-amqp-bom](https://github.com/spring-projects/spring-amqp) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/spring-projects/spring-amqp/releases)
- [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.1.9...v3.1.10)

---
updated-dependencies:
- dependency-name: org.springframework.amqp:spring-amqp-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-18 16:45:35 +00:00
dependabot[bot]
baf1938c8c Bump org.springframework.kafka:spring-kafka-bom from 3.2.7 to 3.2.8 (#9919)
Bumps [org.springframework.kafka:spring-kafka-bom](https://github.com/spring-projects/spring-kafka) from 3.2.7 to 3.2.8.
- [Release notes](https://github.com/spring-projects/spring-kafka/releases)
- [Commits](https://github.com/spring-projects/spring-kafka/compare/v3.2.7...v3.2.8)

---
updated-dependencies:
- dependency-name: org.springframework.kafka:spring-kafka-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-18 16:45:30 +00:00
dependabot[bot]
32a973e3e3 Bump org.springframework.ws:spring-ws-bom from 4.0.11 to 4.0.12 (#9916)
Bumps [org.springframework.ws:spring-ws-bom](https://github.com/spring-projects/spring-ws) from 4.0.11 to 4.0.12.
- [Release notes](https://github.com/spring-projects/spring-ws/releases)
- [Commits](https://github.com/spring-projects/spring-ws/compare/v4.0.11...v4.0.12)

---
updated-dependencies:
- dependency-name: org.springframework.ws:spring-ws-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-18 16:45:11 +00:00
dependabot[bot]
3fabde8121 Bump org.springframework.security:spring-security-bom (#9912)
Bumps the development-dependencies group with 1 update: [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security).


Updates `org.springframework.security:spring-security-bom` from 6.3.7 to 6.3.8
- [Release notes](https://github.com/spring-projects/spring-security/releases)
- [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc)
- [Commits](https://github.com/spring-projects/spring-security/compare/6.3.7...6.3.8)

---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-18 16:44:58 +00:00
dependabot[bot]
19bb052dc6 Bump org.aspectj:aspectjweaver in the development-dependencies group
Bumps the development-dependencies group with 1 update: [org.aspectj:aspectjweaver](https://github.com/eclipse/org.aspectj).


Updates `org.aspectj:aspectjweaver` from 1.9.22.1 to 1.9.23
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)

---
updated-dependencies:
- dependency-name: org.aspectj:aspectjweaver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-15 22:46:26 -04:00
dependabot[bot]
abd5a2bbd7 Bump io.micrometer:micrometer-bom from 1.13.11 to 1.13.12
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.11 to 1.13.12.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.11...v1.13.12)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-15 22:12:00 -04:00
dependabot[bot]
b279cee4d7 Bump io.projectreactor:reactor-bom from 2023.0.15 to 2023.0.16
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2023.0.15 to 2023.0.16.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2023.0.15...2023.0.16)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-16 01:33:15 +00:00
dependabot[bot]
7a3c982dd7 Bump org.springframework.data:spring-data-bom from 2024.0.9 to 2024.0.10
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.0.9 to 2024.0.10.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2024.0.9...2024.0.10)

---
updated-dependencies:
- dependency-name: org.springframework.data:spring-data-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-15 20:48:20 -04:00
dependabot[bot]
b837921955 Bump org.springframework:spring-framework-bom from 6.1.17 to 6.1.18
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.1.17 to 6.1.18.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.17...v6.1.18)

---
updated-dependencies:
- dependency-name: org.springframework:spring-framework-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-15 20:47:31 -04:00
dependabot[bot]
3873516689 Bump io.micrometer:micrometer-tracing-bom from 1.3.9 to 1.3.10
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.3.9 to 1.3.10.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.3.9...v1.3.10)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-15 20:44:55 -04:00
dependabot[bot]
ab365cafe9 Bump org.apache.tomcat.embed:tomcat-embed-websocket
Bumps the development-dependencies group with 1 update: org.apache.tomcat.embed:tomcat-embed-websocket.


Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 10.1.36 to 10.1.39

---
updated-dependencies:
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-08 21:09:21 -05:00
Alexander Hain
cfc5fd9bc6 GH-9878: Fix ConcurrentModificationEx for SpringIntegrationTestExecutionListener
Fixes: #9878
Issue link: https://github.com/spring-projects/spring-integration/issues/9878

* `return Collections.unmodifiableList(this.autoStartupCandidates);` in the `MockIntegrationContext`

Signed-off-by: Alexander Hain <Alexander.hain@cloudflight.io>

[artem.bilan@broadcom.com Improve commit message]

Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
(cherry picked from commit 3d16e59f0b)
2025-03-06 20:35:31 +00:00
dependabot[bot]
0925a55500 Bump org.apache.groovy:groovy-bom from 4.0.25 to 4.0.26
Bumps [org.apache.groovy:groovy-bom](https://github.com/apache/groovy) from 4.0.25 to 4.0.26.
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-01 20:46:34 -05:00
Artem Bilan
d2e1442905 GH-9866: Fix FluxMessageChannel for race condition on destroy
Fixes: #9866
Issue link: https://github.com/spring-projects/spring-integration/issues/9866

Due to race condition between `sink.tryEmitNext()` and `sink.emitComplete()``,
there could be a situation when `onNext` signal slips after `onComplete`.
Appears on fast producers into this `FluxMessageChannel`.
That leads to error like `Spec. Rule 1.3 - onSubscribe, onNext, onError and onComplete signaled to a Subscriber MUST be signaled serially.`

* Fix `FluxMessageChannel` to check for `this.active` one more time just before `sink.tryEmitNext()` call
* Also mitigate a race condition with a `Sinks.EmitFailureHandler.busyLooping(Duration.ofSeconds(1))` in the `destroy()`
instead of `Sinks.EmitFailureHandler.FAIL_FAST`.
The `busyLooping()` would retry requested `onComplete()` signal for that specific error until success or timeout

(cherry picked from commit 7680e02cbb)
2025-02-26 22:47:59 +00:00
Artem Bilan
89f79482c3 GH-9863: Deprecate PollerMetadata.sendTimeout option
Fixes: #9863
Issue link: https://github.com/spring-projects/spring-integration/issues/9863

The `PollerMetadata.sendTimeout` has been migrated to the `SourcePollingChannelAdapter.setSendTimeout()` long time ago.
Right now this option is not propagated anywhere

* Introduce missed `SourcePollingChannelAdapterSpec.sendTimeout`
* Deprecate (for removal) `PollerMetadata.sendTimeout`
* Verify `SourcePollingChannelAdapterSpec.sendTimeout` option in the `ReactiveStreamsTests`

(cherry picked from commit 0af3b25cd6)

# Conflicts:
#	spring-integration-core/src/main/java/org/springframework/integration/dsl/SourcePollingChannelAdapterSpec.java
2025-02-26 16:22:15 -05:00
Spring Builds
f94e922213 [artifactory-release] Next development version 2025-02-18 22:31:02 +00:00
Spring Builds
5f4b13ffa3 [artifactory-release] Release version 6.3.8 2025-02-18 22:31:01 +00:00
Artem Bilan
7195a3e9cf Upgrade dependencies; prepare for release 2025-02-18 16:35:25 -05:00
dependabot[bot]
67dfc3f554 Bump org.springframework:spring-framework-bom from 6.1.16 to 6.1.17 (#9838)
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.1.16 to 6.1.17.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.16...v6.1.17)

---
updated-dependencies:
- dependency-name: org.springframework:spring-framework-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-18 18:49:13 +00:00
dependabot[bot]
e2eba08a3b Bump io.micrometer:micrometer-tracing-bom from 1.3.8 to 1.3.9 (#9831)
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.3.8...v1.3.9)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-16 14:53:14 +00:00
dependabot[bot]
487b31ad24 Bump io.projectreactor:reactor-bom from 2023.0.14 to 2023.0.15 (#9842)
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2023.0.14 to 2023.0.15.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2023.0.14...2023.0.15)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-16 14:50:28 +00:00
dependabot[bot]
d8cba80b5c Bump org.springframework.data:spring-data-bom from 2024.0.8 to 2024.0.9 (#9833)
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.0.8 to 2024.0.9.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2024.0.8...2024.0.9)

---
updated-dependencies:
- dependency-name: org.springframework.data:spring-data-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-16 14:42:36 +00:00
dependabot[bot]
92d9270675 Bump org.jruby:jruby-complete from 9.4.11.0 to 9.4.12.0 (#9839)
Bumps org.jruby:jruby-complete from 9.4.11.0 to 9.4.12.0.

---
updated-dependencies:
- dependency-name: org.jruby:jruby-complete
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-16 14:41:26 +00:00
dependabot[bot]
0bd05875c3 Bump org.apache.tomcat.embed:tomcat-embed-websocket (#9829)
Bumps the development-dependencies group with 1 update: org.apache.tomcat.embed:tomcat-embed-websocket.


Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 10.1.34 to 10.1.35

---
updated-dependencies:
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-16 14:41:00 +00:00
dependabot[bot]
c190692695 Bump io.micrometer:micrometer-bom from 1.13.10 to 1.13.11 (#9835)
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.10 to 1.13.11.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.10...v1.13.11)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-16 14:40:54 +00:00
Artem Bilan
9d38468fd7 Fix formatting in the IntegrationFlowTests 2025-02-16 09:32:07 -05:00
Artem Bilan
e14b5ecd30 More missed imports for IntegrationFlowTests
Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
2025-02-15 23:19:50 -05:00
Artem Bilan
23477afe2c Add missed import to IntegrationFlowTests
Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
2025-02-15 23:11:12 -05:00
Artem Bilan
cc6472cf31 Fix property in the IntegrationFlowTests
Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
2025-02-15 23:03:01 -05:00
Artem Bilan
479521a080 Fix IntegrationFlowTests for missed customTaskScheduler
Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
2025-02-15 22:56:01 -05:00
Artem Bilan
cb85fe0f82 GH-9825: DelayerEndpointSpec: Set TaskScheduler to the handler as well
Fixes: #9825
Issue link: https://github.com/spring-projects/spring-integration/issues/9825

The `DelayerEndpointSpec` extends `ConsumerEndpointSpec` which has a `taskScheduler()` option.
However this is set only to the endpoint for this `MessageHandler`.

* Override `taskScheduler()` method on the `DelayerEndpointSpec` to set
the provided `TaskScheduler` to the `DelayHandler` as well

(cherry picked from commit 12fee0a9fb)
2025-02-13 17:17:27 +00:00
Artem Bilan
7958d580e8 GH-9821: SFTP: Use STAT command to follow symlinks
Fixes: #9821
Issue link: https://github.com/spring-projects/spring-integration/issues/9821

Previously, Spring Integration used JSch library for SFTP protocol,
and that one was able to follow symlinks.
Currently, the `SftpSession` uses `LSTAT` command which does not follow symlinks

* Fix `SftpSession` to call `sftpClient.stat()` instead of `lstat()`
to mitigate migration pain from JSch

(cherry picked from commit efa8dc50b7)
2025-02-12 18:29:15 +00:00
Artem Bilan
bd2744fe22 GH-9818: Fix typos in JavaDocs of JDBC components
Fixes: #9818
Issue link: https://github.com/spring-projects/spring-integration/issues/9818

(cherry picked from commit 370f308fe7)
2025-02-11 16:14:35 +00:00
dependabot[bot]
26a72e124e Bump io.rsocket:rsocket-transport-netty from 1.1.4 to 1.1.5 (#9816)
Bumps [io.rsocket:rsocket-transport-netty](https://github.com/rsocket/rsocket-java) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/rsocket/rsocket-java/releases)
- [Commits](https://github.com/rsocket/rsocket-java/compare/1.1.4...1.1.5)

---
updated-dependencies:
- dependency-name: io.rsocket:rsocket-transport-netty
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-09 00:55:50 +00:00
dependabot[bot]
0502f0e44e Bump com.icegreen:greenmail in the development-dependencies group (#9815)
Bumps the development-dependencies group with 1 update: [com.icegreen:greenmail](https://github.com/greenmail-mail-test/greenmail).


Updates `com.icegreen:greenmail` from 2.1.2 to 2.1.3
- [Release notes](https://github.com/greenmail-mail-test/greenmail/releases)
- [Commits](https://github.com/greenmail-mail-test/greenmail/compare/release-2.1.2...release-2.1.3)

---
updated-dependencies:
- dependency-name: com.icegreen:greenmail
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-09 00:55:28 +00:00
dependabot[bot]
c48c70bb80 Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1 (#9807)
Bumps [org.apache.ftpserver:ftpserver-core](https://github.com/apache/mina-ftpserver) from 1.2.0 to 1.2.1.
- [Commits](https://github.com/apache/mina-ftpserver/compare/1.2.0...ftpserver-parent-1.2.1)

---
updated-dependencies:
- dependency-name: org.apache.ftpserver:ftpserver-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-02 14:02:31 +00:00
dependabot[bot]
6d26ea9042 Bump org.jruby:jruby-complete from 9.4.10.0 to 9.4.11.0 (#9808)
Bumps org.jruby:jruby-complete from 9.4.10.0 to 9.4.11.0.

---
updated-dependencies:
- dependency-name: org.jruby:jruby-complete
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-02 14:01:27 +00:00
Artem Bilan
9c04db461a Revert "GH-9796: Fix SftpSession.write() for concurrency"
This reverts commit e73c3f22a0.
2025-02-02 08:52:04 -05:00
Artem Bilan
5529e7184f Revert "Use org.apache.sshd.sftp.SftpMessage import"
This reverts commit a601439b4b.
2025-02-02 08:51:42 -05:00
Artem Bilan
a601439b4b Use org.apache.sshd.sftp.SftpMessage import
Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
2025-02-01 21:58:46 -05:00
Jelle Smits
8406fd7e4c GH-9794: Encode SMB domain, username & password before SmbFile
Fixes: #9794
Issue link: https://github.com/spring-projects/spring-integration/issues/9794

The `SmbConfig.rawUrl()` method doesn't apply any URL encoding,
resulting in parts of the `domainUserPass` that may contain a `@` character to break
the URL logic in regard to determining the hostname.

* Modify `SmbConfig.getDomainUserPass(_includePassword)` to conditionally encode the variables.
Makes sure to encode the individual parts to not undesirably encode the `;` and `:` characters, breaking other logic.
* Modify `SmbConfig.rawUrl(_includePassword)` and `SmbConfig.createUri(_includePassword)`
to call the modified method with the correct `_urlEncode` variable

Signed-off-by: Jelle Smits <110663902+smitsjelle@users.noreply.github.com>

[artem.bilan@broadcom.com: some code cleanup]

* Add author to the affected classes
* Remove redundant explicit exceptions list from the `SmbMessageHistoryTests`

Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
(cherry picked from commit fcd90a905e)
2025-01-28 21:20:22 +00:00
Artem Bilan
e73c3f22a0 GH-9796: Fix SftpSession.write() for concurrency
Fixes: #9796
Issue link: https://github.com/spring-projects/spring-integration/issues/9796

The `org.apache.sshd.sftp.client.impl.SftpOutputStreamAsync` is shared object for the `DefaultSftpClient`
and it cannot be used concurrently.

The guarded `send()` operation in the `ConcurrentSftpClient` is not enough
since `DefaultSftpClient.write()` is called directly from the `SftpOutputStreamAsync.internalFlush()`.
And this in the end is called from the `SftpSession.write()`

* Fix `DefaultSftpSessionFactory.ConcurrentSftpClient` to override the `write()` method instead.
Guard it with a `Lock` and call `sftpMessage.waitUntilSent();` to ensure that no concurrent access
to the underlying `SftpOutputStreamAsync`.

(cherry picked from commit 91f4fe48b6)
2025-01-28 17:17:30 +00:00
dependabot[bot]
265bea6fab Bump org.apache.groovy:groovy-bom from 4.0.24 to 4.0.25 (#9785)
Bumps [org.apache.groovy:groovy-bom](https://github.com/apache/groovy) from 4.0.24 to 4.0.25.
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-25 21:12:11 -05:00
dependabot[bot]
79cbdad484 Bump graalvmVersion from 23.1.5 to 23.1.6
Updates `org.graalvm.sdk:graal-sdk` from 23.1.5 to 23.1.6
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](https://github.com/oracle/graal/commits)

Updates `org.graalvm.polyglot:js` from 23.1.5 to 23.1.6
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](https://github.com/oracle/graal/commits)

---
updated-dependencies:
- dependency-name: org.graalvm.sdk:graal-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.graalvm.polyglot:js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-21 18:33:28 +00:00
dependabot[bot]
22d4ff5a1a Bump org.jruby:jruby-complete from 9.4.9.0 to 9.4.10.0
---
updated-dependencies:
- dependency-name: org.jruby:jruby-complete
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-21 18:28:56 +00:00