Commit Graph

12298 Commits

Author SHA1 Message Date
dependabot[bot]
1ce14fa117 Bump the development-dependencies group with 4 updates (#10129)
Bumps the development-dependencies group with 4 updates: [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc), [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm), org.apache.tomcat.embed:tomcat-embed-websocket and [org.ajoberstar.grgit](https://github.com/ajoberstar/grgit).


Updates `org.postgresql:postgresql` from 42.7.6 to 42.7.7
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.6...REL42.7.7)

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

Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.7 to 11.0.8

Updates `org.ajoberstar.grgit` from 5.3.0 to 5.3.2
- [Release notes](https://github.com/ajoberstar/grgit/releases)
- [Commits](https://github.com/ajoberstar/grgit/compare/5.3.0...5.3.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-version: 6.6.18.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
  dependency-version: 11.0.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.ajoberstar.grgit
  dependency-version: 5.3.2
  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-06-14 21:30:45 -04:00
Jiandong
ac20fce673 GH-10100: Fix NPE in AbstractMailReceiver.obtainFolderInstance()
Fixes: #10083
Issue link: https://github.com/spring-projects/spring-integration/issues/10100

if `url` is not provided, use `store.getDefaultFolder()` instead.

Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>

(cherry picked from commit cbb0c6fa04)
2025-06-12 14:45:12 +00:00
dependabot[bot]
62474e63d2 Bump org.mongodb:mongodb-driver-bom from 5.5.0 to 5.5.1 (#10085)
Bumps [org.mongodb:mongodb-driver-bom](https://github.com/mongodb/mongo-java-driver) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.5.0...r5.5.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-bom
  dependency-version: 5.5.1
  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-06-07 22:41:47 -04:00
dependabot[bot]
60aa4d017a Bump the development-dependencies group with 5 updates (#10074)
Bumps the development-dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) | `1.21.0` | `1.21.1` |
| [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) | `42.7.5` | `42.7.6` |
| [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm) | `6.6.15.Final` | `6.6.17.Final` |
| com.github.spotbugs | `6.1.12` | `6.1.13` |
| [io.spring.develocity.conventions](https://github.com/spring-io/develocity-conventions) | `0.0.22` | `0.0.23` |


Updates `org.testcontainers:testcontainers-bom` from 1.21.0 to 1.21.1
- [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.21.0...1.21.1)

Updates `org.postgresql:postgresql` from 42.7.5 to 42.7.6
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.5...REL42.7.6)

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

Updates `com.github.spotbugs` from 6.1.12 to 6.1.13

Updates `io.spring.develocity.conventions` from 0.0.22 to 0.0.23
- [Release notes](https://github.com/spring-io/develocity-conventions/releases)
- [Commits](https://github.com/spring-io/develocity-conventions/compare/v0.0.22...v0.0.23)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-version: 1.21.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-version: 6.6.17.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: com.github.spotbugs
  dependency-version: 6.1.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: io.spring.develocity.conventions
  dependency-version: 0.0.23
  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-06-03 15:50:29 +00:00
dependabot[bot]
a7c365787a Bump protobufVersion from 4.31.0 to 4.31.1 (#10076)
Bumps `protobufVersion` from 4.31.0 to 4.31.1.

Updates `com.google.protobuf:protobuf-java` from 4.31.0 to 4.31.1
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v4.31.0...v4.31.1)

Updates `com.google.protobuf:protobuf-java-util` from 4.31.0 to 4.31.1

Updates `com.google.protobuf:protoc` from 4.31.0 to 4.31.1
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v4.31.0...v4.31.1)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-version: 4.31.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.protobuf:protobuf-java-util
  dependency-version: 4.31.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.protobuf:protoc
  dependency-version: 4.31.1
  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-06-03 15:27:32 +00:00
dependabot[bot]
d8ae4c067e Bump debeziumVersion from 3.1.1.Final to 3.1.2.Final (#10078)
Bumps `debeziumVersion` from 3.1.1.Final to 3.1.2.Final.

Updates `io.debezium:debezium-embedded` from 3.1.1.Final to 3.1.2.Final

Updates `io.debezium:debezium-connector-mysql` from 3.1.1.Final to 3.1.2.Final

---
updated-dependencies:
- dependency-name: io.debezium:debezium-embedded
  dependency-version: 3.1.2.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.debezium:debezium-connector-mysql
  dependency-version: 3.1.2.Final
  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-06-03 15:26:41 +00:00
dependabot[bot]
8624a33066 Bump org.apache.groovy:groovy-bom from 4.0.26 to 4.0.27 (#10077)
Bumps [org.apache.groovy:groovy-bom](https://github.com/apache/groovy) from 4.0.26 to 4.0.27.
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy-bom
  dependency-version: 4.0.27
  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-06-03 15:26:21 +00:00
Jiandong
01db420bae GH-10045: Enable JDBC test cases with TestContainers approach
Fixes: https://github.com/spring-projects/spring-integration/issues/10045

Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>
2025-05-30 12:01:48 -04:00
Artem Bilan
8ff3fbd918 Fix threading for FlowServiceTests.testGatewayExplicitReplyChannel
The `enrichHeaders()` operator is put already after an async `gateway()` in the `testGateway` flow definition.
This means that the action of the `enrichHeaders()` could be performed on the returning thread from gateway, or main.

* Move `enrichHeaders()` down to the `subFlow()` bean definition when all the operators are executed as part of
the gateway request from the `testGateway` flow definition.
2025-05-27 12:39:54 -04:00
dependabot[bot]
42b281b5a9 Bump the development-dependencies group with 2 updates (#10056)
Bumps the development-dependencies group with 2 updates: [org.xmlunit:xmlunit-assertj3](https://github.com/xmlunit/xmlunit) and com.github.spotbugs.


Updates `org.xmlunit:xmlunit-assertj3` from 2.10.0 to 2.10.2
- [Release notes](https://github.com/xmlunit/xmlunit/releases)
- [Changelog](https://github.com/xmlunit/xmlunit/blob/main/RELEASE_NOTES.md)
- [Commits](https://github.com/xmlunit/xmlunit/compare/v2.10.0...v2.10.2)

Updates `com.github.spotbugs` from 6.1.11 to 6.1.12

---
updated-dependencies:
- dependency-name: org.xmlunit:xmlunit-assertj3
  dependency-version: 2.10.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: com.github.spotbugs
  dependency-version: 6.1.12
  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-05-24 21:30:52 -04:00
Spring Builds
a8376b2bee [artifactory-release] Next development version 2025-05-20 19:07:16 +00:00
Spring Builds
57110e69a9 [artifactory-release] Release version 6.5.0 2025-05-20 19:07:15 +00:00
Artem Bilan
0a9f226295 Upgrade dependencies; prepare for release 2025-05-20 13:12:58 -04:00
Artem Bilan
bd7f0db3c7 Migrate Hazelcast module from JUnit 4 2025-05-20 12:21:16 -04:00
dependabot[bot]
8f1ed20bdc Bump org.springframework.kafka:spring-kafka-bom from 3.3.5 to 3.3.6 (#10052)
Bumps [org.springframework.kafka:spring-kafka-bom](https://github.com/spring-projects/spring-kafka) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/spring-projects/spring-kafka/releases)
- [Commits](https://github.com/spring-projects/spring-kafka/compare/v3.3.5...v3.3.6)

---
updated-dependencies:
- dependency-name: org.springframework.kafka:spring-kafka-bom
  dependency-version: 3.3.6
  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-05-20 16:13:20 +00:00
Artem Bilan
da1ec071c5 GH-10046: Propagate error strategy in the JmsEndpoint
Fixes: #10046
Issue link: https://github.com/spring-projects/spring-integration/issues/10046

The `JmsMessageDrivenEndpoint` does not propagate an `ErrorMessageStrategy` down to the `ChannelPublishingJmsMessageListener.GatewayDelegate`

* Expose `JmsMessageDrivenEndpoint.setErrorMessageStrategy()` and call respective `this.listener.setErrorMessageStrategy()`

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
2025-05-20 11:20:39 -04:00
Jiandong
5bdf35a7d9 Migrate few modules to Junit Jupiter
including: `spring-integration-amqp`, `spring-integration-file`, 'spring-integration-groovy'

Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>
2025-05-20 10:40:20 -04:00
Jiandong
0a40073305 Fix FileTailingMessageProducerTests.testOS for MacOS
Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>
2025-05-19 11:28:53 -04:00
dependabot[bot]
301b6227e3 Bump io.projectreactor:reactor-bom from 2024.0.5 to 2024.0.6 (#10041)
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2024.0.5 to 2024.0.6.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2024.0.5...2024.0.6)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-bom
  dependency-version: 2024.0.6
  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-05-18 02:33:37 +00:00
dependabot[bot]
968a8f931a Bump org.springframework.retry:spring-retry from 2.0.11 to 2.0.12 (#10042)
Bumps [org.springframework.retry:spring-retry](https://github.com/spring-projects/spring-retry) from 2.0.11 to 2.0.12.
- [Release notes](https://github.com/spring-projects/spring-retry/releases)
- [Commits](https://github.com/spring-projects/spring-retry/compare/v2.0.11...v2.0.12)

---
updated-dependencies:
- dependency-name: org.springframework.retry:spring-retry
  dependency-version: 2.0.12
  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-05-18 01:29:53 +00:00
dependabot[bot]
2d9808153a Bump org.springframework:spring-framework-bom from 6.2.6 to 6.2.7 (#10043)
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.2.6 to 6.2.7.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.6...v6.2.7)

---
updated-dependencies:
- dependency-name: org.springframework:spring-framework-bom
  dependency-version: 6.2.7
  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-05-18 01:29:35 +00:00
dependabot[bot]
946a5f6547 Bump the development-dependencies group with 2 updates (#10037)
Bumps the development-dependencies group with 2 updates: [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm) and org.apache.tomcat.embed:tomcat-embed-websocket.


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

Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.6 to 11.0.7

---
updated-dependencies:
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-version: 6.6.15.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
  dependency-version: 11.0.7
  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-05-18 01:01:29 +00:00
Jooyoung Pyoung
debd4d45c2 GH-9988: Add FileExistsMode expression support
Fixes: #9988
Issue link: https://github.com/spring-projects/spring-integration/issues/9988

This change allows dynamic determination of `FileExistsMode` using SpEL expressions,
making the component more flexible when handling file existence conflicts.

* Add `fileExistsModeExpression` field and setter methods
* Use `resolveFileExistsMode()` in put and get operations
* Add changes to the docs
* Ignore `temporaryFileName` when `FileExistsMode.APPEND`

Improve runtime behavior by ignoring temporary filename settings when file exists mode is `APPEND`. 
Now, in `FileExistsMode.APPEND` mode, content is always appended directly to the original file regardless of `useTemporaryFileName` setting.

In `RemoteFileTemplate`:
- Remove exception validation when `APPEND` mode is used with temporary filenames
- Modify logic to skip applying `temporaryFileSuffix` in `APPEND` mode

In `AbstractRemoteFileOutboundGateway`:
- Remove logic that disabled temporary filenames when setting `APPEND` mode

* Apply review feedback on `FileExistsMode` expression

- Optimize `EvaluationContext` usage by creating it once in `doInit()`
- Enhance expression evaluation to support String representation of `FileExistsMode`
- Optimize temporary filename handling logic in `RemoteFileTemplate`
- Add warning message for incompatible `APPEND` mode with temporary filenames
- Rename method to `setFileExistsModeExpressionString` for consistency
- Update Java DSL support in `RemoteFileOutboundGatewaySpec`
- Update reference documentation and release notes

* Apply additional review feedback on `FileExistsMode` expression

- Add `Function` variant to `RemoteFileOutboundGatewaySpec`
- Update documentations to use one-sentence-per-line style
- Improve code flow in `resolveFileExistsMode()` method

* Fix additional review feedback on `FileExistsMode` expression

- Use `Object` instead of `String` in `fileExistsModeFunction`
- Fix return method call in `fileExistsModeFunction` (`remoteDirectoryExpression` -> `fileExistsModeExpression`)
- Fix `standardEvaluationContext` initialization in `doInit()`
- Ensure proper `EvaluationContext` usage in other methods

Signed-off-by: Jooyoung Pyoung <pyoungjy@gmail.com>
2025-05-15 10:47:07 -04:00
Artem Bilan
9bdbb6ed1c Upgrade to Jackson 2.19.0 2025-05-14 09:08:55 -04:00
Artem Bilan
cf6f2d6fc2 GH-10018: Fix bugs from the previous commit
Related to: https://github.com/spring-projects/spring-integration/issues/10018
2025-05-12 16:49:13 -04:00
Artem Bilan
bd4e041185 GH-10018: Implement async for Java DSL gateway()
Fixes: https://github.com/spring-projects/spring-integration/issues/10018

The `GatewayEndpointSpec` configuration of the `gateway()` operator support already an `async(true)` option.
However, it is silently ignored internally since no real async contract provided for the gateway proxy.

* Introduce the `AsyncRequestReplyExchanger` interface to use instead of `RequestReplyExchanger`,
when  `gateway()` operator is opted-in for the `async(true)`
* Use this new `AsyncRequestReplyExchanger` in the `GatewayMessageHandler` when `async(true)`
* Also, expose a `GatewayEndpointSpec.asyncExecutor(Executor)` option to support async behavior similar to the `@MessagingGateway`
2025-05-12 16:19:23 -04:00
dependabot[bot]
53cccd0b25 Bump com.fasterxml.jackson:jackson-bom from 2.18.3 to 2.18.4 (#10012)
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.18.3 to 2.18.4.
- [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.18.3...jackson-bom-2.18.4)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson:jackson-bom
  dependency-version: 2.18.4
  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-05-11 00:18:49 +00:00
dependabot[bot]
b7b5e3f779 Bump org.jruby:jruby-complete from 9.4.12.0 to 9.4.12.1 (#10011)
Bumps org.jruby:jruby-complete from 9.4.12.0 to 9.4.12.1.

---
updated-dependencies:
- dependency-name: org.jruby:jruby-complete
  dependency-version: 9.4.12.1
  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-05-11 00:09:05 +00:00
dependabot[bot]
5a44b9cf75 Bump com.github.spotbugs in the development-dependencies group (#10010)
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


Updates `com.github.spotbugs` from 6.1.10 to 6.1.11

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-version: 6.1.11
  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-05-11 00:08:14 +00:00
Artem Bilan
ed211011e8 Upgrade to MongoDB 5.5.0 2025-05-08 10:05:39 -04:00
Jiandong
587693fc01 Migrate spring-integration-core tests from Junit 4 to Junit Jupiter
* Remove redundant assert from lambda in test

Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>
Signed-off-by: Artem Bilan <artem.bilan@broadcom.com>
Co-authored-by: Artem Bilan <artem.bilan@broadcom.com>
2025-05-07 11:04:26 -04:00
Jiandong
2467370a30 Migrate spring-integration-ip tests from Junit 4 to Junit Jupiter
Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>
2025-05-05 10:57:26 -04:00
dependabot[bot]
b6be3455c5 Bump org.apache.camel:camel-bom from 4.10.3 to 4.10.4 (#10007)
Bumps org.apache.camel:camel-bom from 4.10.3 to 4.10.4.

---
updated-dependencies:
- dependency-name: org.apache.camel:camel-bom
  dependency-version: 4.10.4
  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-05-04 00:11:46 +00:00
Jiandong
c58e21806f GH-10003: Fix AbstractCorrelatingMessageHandler for releasePartialSequences propagation
Fixes: #10003
Issue Link: https://github.com/spring-projects/spring-integration/issues/10003

The `AbstractCorrelatingMessageHandler`.setReleasePartialSequences()` populates a `SequenceSizeReleaseStrategy`,
but don't propagate the `releasePartialSequences` into that strategy for its "partial" logic.

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

Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>
Co-authored by: Artem Bilan <artem.bilan@broadcom.com>
2025-05-02 11:45:01 -04:00
Artem Bilan
05ee9ff4a9 GH-9999: Fix FluxMessageChannel for restarted application
Fixes: #9999
Issue link: https://github.com/spring-projects/spring-integration/issues/9999

After the application context stop, the `FluxMessageChannel` continues to try to emit messages.
Just because subscriptions to the provided publishers are not cancelled.
More over, we would like to come back to the production from those publishers when we start
application back.

* Fix `FluxMessageChannel` implementing a `Lifecycle` contract.
Gather provided publisher in a local cache to come back to them when we call `start()`,
essentially, initiating a new subscription to those provided publishers

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
2025-04-30 17:04:31 -04:00
Jiandong
119209d1ad Fix exception message for JpaExecutor.doPoll()
Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>

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

Fixes: #9997

The `nativeQuery` has to be mention in the possible required options to configure.

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
2025-04-28 11:55:01 -04:00
dependabot[bot]
dd9db176bb Bump io.micrometer:micrometer-tracing-bom (#9991)
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.5.0-RC1 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-version: 1.5.0-SNAPSHOT
  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-04-27 00:38:27 +00:00
dependabot[bot]
e6418287ce Bump org.springframework.data:spring-data-bom (#9992)
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2025.0.0-RC1 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-version: 2025.0.0-SNAPSHOT
  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-04-27 00:37:52 +00:00
dependabot[bot]
d910aa5456 Bump org.springframework.ws:spring-ws-bom (#9994)
Bumps [org.springframework.ws:spring-ws-bom](https://github.com/spring-projects/spring-ws) from 4.1.0-RC1 to 4.1.0-SNAPSHOT.
- [Release notes](https://github.com/spring-projects/spring-ws/releases)
- [Commits](https://github.com/spring-projects/spring-ws/commits)

---
updated-dependencies:
- dependency-name: org.springframework.ws:spring-ws-bom
  dependency-version: 4.1.0-SNAPSHOT
  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-04-27 00:33:16 +00:00
dependabot[bot]
e899ea9381 Bump io.micrometer:micrometer-bom from 1.15.0-RC1 to 1.15.0-SNAPSHOT (#9995)
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.15.0-RC1 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-version: 1.15.0-SNAPSHOT
  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-04-27 00:32:56 +00:00
dependabot[bot]
87320c1855 Bump org.springframework.security:spring-security-bom (#9990)
Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.5.0-RC1 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-version: 6.5.0-SNAPSHOT
  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-04-27 00:32:26 +00:00
dependabot[bot]
21894b94cb Bump org.springframework.graphql:spring-graphql (#9993)
Bumps [org.springframework.graphql:spring-graphql](https://github.com/spring-projects/spring-graphql) from 1.4.0-RC1 to 1.4.0-SNAPSHOT.
- [Release notes](https://github.com/spring-projects/spring-graphql/releases)
- [Commits](https://github.com/spring-projects/spring-graphql/commits)

---
updated-dependencies:
- dependency-name: org.springframework.graphql:spring-graphql
  dependency-version: 1.4.0-SNAPSHOT
  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-04-27 00:32:09 +00:00
dependabot[bot]
fa950b227b Bump com.github.spotbugs in the development-dependencies group (#9989)
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


Updates `com.github.spotbugs` from 6.1.9 to 6.1.10

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-version: 6.1.10
  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-04-27 00:31:21 +00:00
Spring Builds
244a9ff938 [artifactory-release] Next development version 2025-04-22 20:29:45 +00:00
Spring Builds
55a69c7c6c [artifactory-release] Release version 6.5.0-RC1 2025-04-22 20:29:44 +00:00
Artem Bilan
21fbc79124 Upgrade to the latest Milestones; prepare for release 2025-04-22 15:47:23 -04:00
Artem Bilan
30355f243c GH-9985: Fix NPE in ReqHandlerRetryAdvice with MetricsRetryListener
Fixes: #9985
Issue link: https://github.com/spring-projects/spring-integration/issues/9985

When `RequestHandlerRetryAdvice` is supplied with a `RetryTemplate` and `MetricsRetryListener`,
the `NullPointerException` is thrown from the Micrometer `Timer`, where `name` tag cannot be `null`.
In fact, the `RetryCallback` implementation in the `RequestHandlerRetryAdvice` does not provide any `label`.

* Fix `RequestHandlerRetryAdvice` to produce label based on the `componentName` or just class name of the
AOP caller as fallback

**Auto-cherry-pick to `6.4.x` & `6.3.x`**
2025-04-22 15:43:54 -04:00
dependabot[bot]
bef2d091c5 Bump com.github.spotbugs in the development-dependencies group (#9975)
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


Updates `com.github.spotbugs` from 6.1.7 to 6.1.9

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-version: 6.1.9
  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-04-22 16:50:25 +00:00
dependabot[bot]
3c20361a6a Bump org.springframework.kafka:spring-kafka-bom from 3.3.4 to 3.3.5 (#9983)
Bumps [org.springframework.kafka:spring-kafka-bom](https://github.com/spring-projects/spring-kafka) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/spring-projects/spring-kafka/releases)
- [Commits](https://github.com/spring-projects/spring-kafka/compare/v3.3.4...v3.3.5)

---
updated-dependencies:
- dependency-name: org.springframework.kafka:spring-kafka-bom
  dependency-version: 3.3.5
  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-04-22 16:44:02 +00:00
dependabot[bot]
c5936add4a Bump org.springframework.amqp:spring-amqp-bom from 3.2.4 to 3.2.5 (#9980)
Bumps [org.springframework.amqp:spring-amqp-bom](https://github.com/spring-projects/spring-amqp) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/spring-projects/spring-amqp/releases)
- [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.2.4...v3.2.5)

---
updated-dependencies:
- dependency-name: org.springframework.amqp:spring-amqp-bom
  dependency-version: 3.2.5
  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-04-22 16:42:55 +00:00