Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,185 Commits 25 Branches 0 Tags
7680e02cbb009b591cc9477fc4cb9d3fc6db71a2
Commit Graph

12185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Artem Bilan
7680e02cbb 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

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
 2025-02-26 17:47:23 -05:00
Artem Bilan
d54d55653f GH-9863: Remove deprecated PollerMetadata.sendTimeout option 
Issue link: https://github.com/spring-projects/spring-integration/issues/9863

The `PollerMetadata.sendTimeout` has been deprecated in previous versions
in favor of ``

* Remove `PollerMetadata.sendTimeout` and `PollerSpec.sendTimeout`
in favor of `SourcePollingChannelAdapterSpec.sendTimeout`
 2025-02-26 16:26:56 -05:00
Artem Bilan
0af3b25cd6 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`

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
 2025-02-26 16:19:14 -05:00
Artem Bilan
478d6b1b07 GH-9862: Document caching for SMB sessions 
Fixes: https://github.com/spring-projects/spring-integration/issues/9862

* Fix typo in the `message.adoc`
 2025-02-24 12:20:19 -05:00
dependabot[bot]
4bf83f3d87 Bump the development-dependencies group with 2 updates (#9856) 
Bumps the development-dependencies group with 2 updates: [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) and [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm).


Updates `org.testcontainers:testcontainers-bom` from 1.20.4 to 1.20.5
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.4...1.20.5)

Updates `org.hibernate.orm:hibernate-core` from 6.6.8.Final to 6.6.9.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.6.9/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/6.6.8...6.6.9)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.hibernate.orm:hibernate-core
  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-23 00:53:22 +00:00
dependabot[bot]
d7cbf6d6a0 Bump io.micrometer:micrometer-tracing-bom (#9859) 
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.5.0-M2 to 1.5.0-SNAPSHOT.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/commits)

---
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-23 00:48:25 +00:00
dependabot[bot]
08155fbed4 Bump org.springframework.data:spring-data-bom (#9858) 
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2025.0.0-M1 to 2025.0.0-SNAPSHOT.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/commits)

---
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-23 00:44:13 +00:00
dependabot[bot]
ded0b2f7cf Bump io.lettuce:lettuce-core from 6.5.3.RELEASE to 6.5.4.RELEASE (#9861) 
Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.5.3.RELEASE to 6.5.4.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/redis/lettuce/blob/6.5.4.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.5.3.RELEASE...6.5.4.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-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-23 00:43:24 +00:00
dependabot[bot]
70034151c0 Bump io.micrometer:micrometer-bom from 1.15.0-M2 to 1.15.0-SNAPSHOT (#9860) 
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.15.0-M2 to 1.15.0-SNAPSHOT.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/commits)

---
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-23 00:42:28 +00:00
dependabot[bot]
b6f57c67eb Bump org.springframework.security:spring-security-bom (#9857) 
Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.5.0-M2 to 6.5.0-SNAPSHOT.
- [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/commits)

---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-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-23 00:42:14 +00:00
Artem Bilan
2296e4798e GH-9854: Special error for "too early message production" 
Fixes: https://github.com/spring-projects/spring-integration/issues/9854

The well-known `Dispatcher has no subscribers` is not very informative
when a message is produced from early application context initialization phase

* Add internal `ApplicationRunningController` bean to handle early `start()` event
* Check for this bean status from the `AbstractMessageChannel.send()`
* Throw specific `MessageDispatchingException` to indicate that the message was produced from a wrong place
* Adjust `ApplicationEventListeningMessageProducer` logic for `ContextStoppedEvent` & `ContextClosedEvent`
to indicate that `AbstractMessageChannel` bean might not dispatch a message because the application context is not running
 2025-02-20 17:46:27 -05:00
Artem Bilan
84a3be1022 Fix project version 
Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
 2025-02-19 20:52:29 -05:00
Spring Builds
0e32da4f4b [artifactory-release] Next development version 2025-02-19 01:35:04 +00:00
Spring Builds
eda887956e [artifactory-release] Release version 6.4.2 2025-02-19 01:35:03 +00:00
Artem Bilan
2611b6f5f1 Add tentative manual-finalize-release.yml 2025-02-18 20:15:28 -05:00
Spring Builds
1564b978e2 [artifactory-release] Next development version 2025-02-19 00:00:55 +00:00
Spring Builds
a18e5c3ef2 [artifactory-release] Release version 6.5.0-M2 2025-02-19 00:00:54 +00:00
dependabot[bot]
62b438d88b Bump org.apache.tomcat.embed:tomcat-embed-websocket (#9851) 
Bumps the development-dependencies group with 1 update: org.apache.tomcat.embed:tomcat-embed-websocket.


Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.3 to 11.0.4

---
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-18 22:27:35 +00:00
Artem Bilan
2fab6c509e Upgrade dependencies; prepare for release 2025-02-18 16:51:31 -05:00
dependabot[bot]
b91faed7b5 Bump org.springframework:spring-framework-bom from 6.2.2 to 6.2.3 (#9845) 
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.2.2 to 6.2.3.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.2...v6.2.3)

---
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-16 14:51:26 +00:00
dependabot[bot]
45b1eda01a Bump io.projectreactor:reactor-bom from 2024.0.2 to 2024.0.3 (#9847) 
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2024.0.2 to 2024.0.3.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2024.0.2...2024.0.3)

---
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 01:03:31 +00:00
dependabot[bot]
b963680e24 Bump org.springframework.data:spring-data-bom from 2024.1.2 to 2024.1.3 (#9846) 
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.1.2 to 2024.1.3.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2024.1.2...2024.1.3)

---
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 00:55:11 +00:00
dependabot[bot]
13e8e57e3a Bump org.jruby:jruby-complete from 9.4.11.0 to 9.4.12.0 (#9844) 
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 00:52:46 +00:00
dependabot[bot]
2b928c47ba Bump the development-dependencies group with 3 updates (#9843) 
Bumps the development-dependencies group with 3 updates: [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm), org.apache.tomcat.embed:tomcat-embed-websocket and com.github.spotbugs.


Updates `org.hibernate.orm:hibernate-core` from 6.6.6.Final to 6.6.8.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.6.8/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/6.6.6...6.6.8)

Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.2 to 11.0.3

Updates `com.github.spotbugs` from 6.1.3 to 6.1.5

---
updated-dependencies:
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: com.github.spotbugs
  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 00:52:25 +00:00
Artem Bilan
12fee0a9fb 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

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
 2025-02-13 12:13:52 -05:00
Mohammadreza Yektamaram
173f7954a2 Removed unused bean from SFTP test config 
The present bean is left over there after migration from JSch to Apache MINA.

Signed-off-by: Mohammadreza Yektamaram <mohammad.1ta@gmail.com>
 2025-02-13 11:24:19 -05:00
Artem Bilan
efa8dc50b7 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

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
 2025-02-12 13:28:41 -05:00
Artem Bilan
478409e199 Fix SF deprecation in the HttpOutboundGatewayParserTests 2025-02-12 09:44:13 -05:00
Artem Bilan
32e3d18c94 Fix race condition in the PostgresChannelMessageTableSubscriberTests 
Adding two messages into a group may end up with wrong insert order.
Or better to say the timestamp of first messages inserted might be behind in the future after the second one.
This leads to a wrong order return for polling operation and, therefore, verification in the test.

* Fix `PostgresChannelMessageTableSubscriberTests` inserting `Thread.sleep(100);`
between `messageStore.addMessageToGroup()` operations
 2025-02-11 11:59:54 -05:00
Artem Bilan
8dab7409b5 GH-9792: Remove resource header in the StreamTransformer 
Fixes: https://github.com/spring-projects/spring-integration/issues/9792

The `StreamTransformer` closes `IntegrationMessageHeaderAccessor.CLOSEABLE_RESOURCE` header value,
so this becomes unusable afterward.
In addition, it may even cause some problems downstream when the message could be serialized for
subsequent network interaction.

* Add logic to the `StreamTransformer` to build a new message, but remove `IntegrationMessageHeaderAccessor.CLOSEABLE_RESOURCE` header
* Verify that header is removed in the `StreamingInboundTests`.
Addition `StreamingInboundTests` clean up for better code style.
 2025-02-11 11:47:33 -05:00
Artem Bilan
370f308fe7 GH-9818: Fix typos in JavaDocs of JDBC components 
Fixes: #9818
Issue link: https://github.com/spring-projects/spring-integration/issues/9818

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
 2025-02-11 11:13:55 -05:00
dependabot[bot]
8d506d5a88 Bump io.rsocket:rsocket-transport-netty from 1.1.4 to 1.1.5 (#9814) 
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:26:54 +00:00
dependabot[bot]
8df9b1a601 Bump the development-dependencies group with 2 updates (#9813) 
Bumps the development-dependencies group with 2 updates: [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm) and [com.icegreen:greenmail](https://github.com/greenmail-mail-test/greenmail).


Updates `org.hibernate.orm:hibernate-core` from 6.6.5.Final to 6.6.6.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.6.6/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/6.6.5...6.6.6)

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: org.hibernate.orm:hibernate-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-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:26:33 +00:00
Artem Bilan
23d22f6cbd Remove redundant manual-finalize-release.yml 2025-02-07 10:57:35 -05:00
dependabot[bot]
f76c4d0e01 Bump com.github.spotbugs in the development-dependencies group (#9802) 
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


Updates `com.github.spotbugs` from 6.1.2 to 6.1.3

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  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-02 00:08:55 +00:00
dependabot[bot]
30abae6947 Bump org.jruby:jruby-complete from 9.4.10.0 to 9.4.11.0 (#9805) 
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 00:06:36 +00:00
dependabot[bot]
0530e414b6 Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1 (#9804) 
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 00:05:54 +00:00
dependabot[bot]
2b5111fcd0 Bump io.lettuce:lettuce-core from 6.5.2.RELEASE to 6.5.3.RELEASE (#9803) 
Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.5.2.RELEASE to 6.5.3.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/redis/lettuce/blob/6.5.3.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.5.2.RELEASE...6.5.3.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-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 00:05:43 +00:00
Artem Bilan
054ff57728 GH-9801: Kafka: generate ID & TIMESTAMP headers by default 
Fixes: https://github.com/spring-projects/spring-integration/issues/9801

Spring Integration Apache Kafka inbound channel adapters have always produced
messages without `ID` & `TIMESTAMP` headers.
See `MessagingMessageConverter` used over there by default.
However, for consistency with the rest of Spring Integration channel adapters,
it would be better to have Kafka-specific behave same way.

* Configure default `MessagingMessageConverter` in the `KafkaMessageSource` & `KafkaMessageDrivenChannelAdapter`
for generating `ID` & `TIMESTAMP` headers.
 2025-01-30 16:53:09 -05:00
Artem Bilan
c44363a69d Use main version of reusable WF in merge-dependabot-pr.yml 
The `spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml` behaviour has been changed.
So, this change is to test it for the next Dependabot updates cycle.
 2025-01-29 14:14:17 -05:00
Jelle Smits
36e4012a56 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`

**Auto-cherry-pick to `6.4.x` & `6.3.x`**

Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
 2025-01-28 16:04:33 -05:00
Artem Bilan
91f4fe48b6 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`.

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
 2025-01-28 12:16:54 -05:00
dependabot[bot]
69aaa1d451 Bump io.micrometer:micrometer-tracing-bom (#9790) 
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.5.0-M1 to 1.5.0-SNAPSHOT.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/commits)

---
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-01-26 01:04:14 +00:00
dependabot[bot]
facfcf0515 Bump org.apache.groovy:groovy-bom from 4.0.24 to 4.0.25 (#9789) 
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-26 01:00:29 +00:00
dependabot[bot]
46b8c4c511 Bump org.springframework.security:spring-security-bom (#9788) 
Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.5.0-M1 to 6.5.0-SNAPSHOT.
- [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/commits)

---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-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-26 00:59:58 +00:00
dependabot[bot]
d0ce31c332 Bump mongoDriverVersion from 5.3.0 to 5.3.1 (#9786) 
Bumps `mongoDriverVersion` from 5.3.0 to 5.3.1.

Updates `org.mongodb:mongodb-driver-sync` from 5.3.0 to 5.3.1
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.3.0...r5.3.1)

Updates `org.mongodb:mongodb-driver-reactivestreams` from 5.3.0 to 5.3.1
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.3.0...r5.3.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:mongodb-driver-reactivestreams
  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-26 00:59:20 +00:00
dependabot[bot]
8173011eef Bump io.micrometer:micrometer-bom from 1.15.0-M1 to 1.15.0-SNAPSHOT (#9787) 
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.15.0-M1 to 1.15.0-SNAPSHOT.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/commits)

---
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-01-26 00:58:33 +00:00
Artem Bilan
a0a2e76ee2 Fix deprecation in the HttpOutboundChannelAdapterParserTests 
The SF `6.2.2` has a `ResponseErrorHandler.handleError(ClientHttpResponse)` deprecated

**Auto-cherry-pick to `6.4.x`**
 2025-01-23 10:29:08 -05:00
Spring Builds
24594f6988 [artifactory-release] Next development version 2025-01-21 20:28:49 +00:00
Spring Builds
809b0c828a [artifactory-release] Release version 6.5.0-M1 2025-01-21 20:28:48 +00:00