Commit Graph

12072 Commits

Author SHA1 Message Date
Artem Bilan
2cf83b5311 GH-9695: Replace AMQP tx-size with batch-size
Fixes: #9695
Issue link: https://github.com/spring-projects/spring-integration/issues/9695

The `txSize` in the `SimpleMessageListenerContainer` has been replaced with more reasonable `batchSize`.
Spring Integration XML support for AMQP module has missed to fix this change: we didn't have a respective test.

* Deprecate `tx-size` (will be removed in `6.5`) XML attribute for the `<amqp:inbound-channel-adapter>`
and introduce `batch-size`
* Cover with the tests
* Fix docs from `tx-size` to `batch-size`

**Auto-cherry-pick to `6.3.x`**
2024-12-05 13:58:59 -05:00
Artem Bilan
e2aa904a7b More @DirtiesContext for tests in attempt to mitigate OOM error on CI/CD 2024-12-03 11:58:46 -05:00
dependabot[bot]
567fb9bae8 Bump com.fasterxml.jackson:jackson-bom from 2.18.1 to 2.18.2
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.18.1 to 2.18.2.
- [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.18.1...jackson-bom-2.18.2)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson:jackson-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>
2024-12-02 15:56:09 -05:00
dependabot[bot]
f2e94e3f8c Bump org.apache.logging.log4j:log4j-bom from 2.24.1 to 2.24.2 (#9682)
Bumps [org.apache.logging.log4j:log4j-bom](https://github.com/apache/logging-log4j2) from 2.24.1 to 2.24.2.
- [Release notes](https://github.com/apache/logging-log4j2/releases)
- [Changelog](https://github.com/apache/logging-log4j2/blob/2.x/RELEASE-NOTES.adoc)
- [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.24.1...rel/2.24.2)

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-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>
2024-12-02 20:52:45 +00:00
dependabot[bot]
40c4402ee2 Bump debeziumVersion from 3.0.2.Final to 3.0.4.Final
Bumps `debeziumVersion` from 3.0.2.Final to 3.0.4.Final.

Updates `io.debezium:debezium-embedded` from 3.0.2.Final to 3.0.4.Final

Updates `io.debezium:debezium-connector-mysql` from 3.0.2.Final to 3.0.4.Final

---
updated-dependencies:
- dependency-name: io.debezium:debezium-embedded
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.debezium:debezium-connector-mysql
  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>
2024-12-02 14:03:59 -05:00
dependabot[bot]
6a3ec928ff Bump com.icegreen:greenmail in the development-dependencies group
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.1 to 2.1.2
- [Release notes](https://github.com/greenmail-mail-test/greenmail/releases)
- [Commits](https://github.com/greenmail-mail-test/greenmail/compare/release-2.1.1...release-2.1.2)

---
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>
2024-12-02 14:01:58 -05:00
Artem Bilan
6c426308f0 Adjust BaseIntegrationFlowDefinition.controlBus() deprecation
Related to: https://github.com/spring-projects/spring-integration/issues/9683.

Since we are going to restore `controlBus()` for convenience,
and only one way of Control Bus pattern, based on the `ControlBusCommandRegistry`, there is no need to have another `controlBusOnRegistry()` method

* Also fix link for `error-handling` chapter from the `special-channels.adoc`
2024-12-02 13:29:40 -05:00
dependabot[bot]
4f0ac8908b Bump the development-dependencies group with 2 updates (#9681)
Bumps the development-dependencies group with 2 updates: [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) and [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm).


Updates `org.springframework.security:spring-security-bom` from 6.4.0 to 6.4.1
- [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.4.0...6.4.1)

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

---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-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>
2024-11-23 21:53:38 -05:00
dependabot[bot]
b2ca9542bd Bump org.testcontainers:testcontainers-bom (#9679)
Bumps the development-dependencies group with 1 update: [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java).


Updates `org.testcontainers:testcontainers-bom` from 1.20.3 to 1.20.4
- [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.3...1.20.4)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-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>
2024-11-22 21:06:51 +00:00
Artem Bilan
da58fef3e0 More @DirtiesContext for tests in core module 2024-11-22 11:49:54 -05:00
Artem Bilan
4ebe56e99d Remove 6.2.x branch from Dependabot management
The branch has moved out of Open Source Support
2024-11-20 12:27:37 -05:00
Spring Builds
04dfaf918d [artifactory-release] Next development version 2024-11-19 23:17:21 +00:00
Spring Builds
75e004d12f [artifactory-release] Release version 6.4.0 2024-11-19 23:17:20 +00:00
Artem Bilan
f8bc3cb66f Revert "An attempt to avoid *-SNAPSHOT updates from Dependabot"
This reverts commit c5015e7002.
2024-11-19 13:59:19 -05:00
Artem Bilan
c5015e7002 An attempt to avoid *-SNAPSHOT updates from Dependabot 2024-11-19 13:44:54 -05:00
dependabot[bot]
fbe059731d Bump com.icegreen:greenmail in the development-dependencies group (#9675)
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.0 to 2.1.1
- [Release notes](https://github.com/greenmail-mail-test/greenmail/releases)
- [Commits](https://github.com/greenmail-mail-test/greenmail/compare/release-2.1.0...release-2.1.1)

---
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>
2024-11-19 16:51:02 +00:00
dependabot[bot]
cf2310e43c Bump spring-io/spring-github-workflows (#9670)
Bumps the development-dependencies group with 1 update: [spring-io/spring-github-workflows](https://github.com/spring-io/spring-github-workflows).


Updates `spring-io/spring-github-workflows` from 4 to 5
- [Release notes](https://github.com/spring-io/spring-github-workflows/releases)
- [Commits](https://github.com/spring-io/spring-github-workflows/compare/v4...v5)

---
updated-dependencies:
- dependency-name: spring-io/spring-github-workflows
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-19 16:49:52 +00:00
Artem Bilan
22cdc43da0 Upgrade to Debezium 3.0.2
Fixes: https://github.com/spring-projects/spring-integration/pull/9651

* Use latest `debezium/example-mysql:3.0.0.Final` Docker image
* Fix `DebeziumBatchTests` for initial DB initialization events:
apparently new Debezium (even if it is a patch version)
does not populate headers for those events
2024-11-19 09:41:58 -05:00
Artem Bilan
49863384f8 Update Spring deps to GAs; prepare for release 2024-11-19 09:15:52 -05:00
Artem Bilan
b1d676d493 Revert Dependabot updates for SNAPSHOTs
Essentially, we would expect updates to GAs, but somehow Dependabot treats a new SNAPSHOT as higher version.
Well, it is higher, but looks like there is no way to prevent Dependabot to skip SNAPSHOTs from being updated

Revert "Bump org.springframework.data:spring-data-bom (#9652)"

This reverts commit 4628bdcc55.

Revert "Bump io.micrometer:micrometer-bom (#9655)"

This reverts commit 74be461771.
2024-11-19 09:12:49 -05:00
dependabot[bot]
4628bdcc55 Bump org.springframework.data:spring-data-bom (#9652)
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.1.0-SNAPSHOT to 2024.1.1-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>
2024-11-17 00:46:20 +00:00
dependabot[bot]
74be461771 Bump io.micrometer:micrometer-bom (#9655)
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.14.0-SNAPSHOT to 1.14.2-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>
2024-11-17 00:44:50 +00:00
dependabot[bot]
4c049600f0 Bump org.apache.tomcat.embed:tomcat-embed-websocket (#9649)
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.31 to 10.1.33

---
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>
2024-11-17 00:44:30 +00:00
Artem Bilan
8f4c2be0cb More @DirtiesContext for tests in core module
Additional code style cleanups in the affected classes

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
2024-11-15 13:40:29 -05:00
Artem Bilan
09750f2012 Remove unnecessary Thread.sleep() from the AsyncGatewayTests
Such a `Thread.sleep()` makes tests slower, plus may cause a longer timing issue on slow CI/CD when CPU resources are limited

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
2024-11-14 14:49:52 -05:00
Artem Bilan
4ccec0bae3 More @DirtiesContext in test of core module
The another attempt to mitigate out of memory error on GitHub Actions
2024-11-12 15:52:52 -05:00
Artem Bilan
a171ffd12d The EmbeddedJsonHeadersMessageMapper cleanups 2024-11-12 14:32:24 -05:00
Artem Bilan
a96b5f0a6b GH-9647: Add AmqpInboundChannelAdapter.setHeaderNameForBatchedHeaders()
Fixes: #9647
Issue link: https://github.com/spring-projects/spring-integration/issues/9647
2024-11-12 10:52:42 -05:00
Artem Bilan
29cd21624c Remove tentative update-version-on-website.yml for testing 2024-11-11 14:30:48 -05:00
dependabot[bot]
8757bd623f Bump the development-dependencies group with 3 updates (#9643)
Bumps the development-dependencies group with 3 updates: org.hsqldb:hsqldb, [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm) and [com.thoughtworks.xstream:xstream](https://github.com/x-stream/xstream).


Updates `org.hsqldb:hsqldb` from 2.7.3 to 2.7.4

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

Updates `com.thoughtworks.xstream:xstream` from 1.4.20 to 1.4.21
- [Release notes](https://github.com/x-stream/xstream/releases)
- [Commits](https://github.com/x-stream/xstream/commits)

---
updated-dependencies:
- dependency-name: org.hsqldb:hsqldb
  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
- dependency-name: com.thoughtworks.xstream:xstream
  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>
2024-11-10 12:24:33 +00:00
dependabot[bot]
dee5c943f1 Bump org.jruby:jruby-complete from 9.4.8.0 to 9.4.9.0 (#9646)
Bumps org.jruby:jruby-complete from 9.4.8.0 to 9.4.9.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>
2024-11-10 00:42:13 +00:00
dependabot[bot]
e08a5b51f1 Bump mongoDriverVersion from 5.2.0 to 5.2.1 (#9644)
Bumps `mongoDriverVersion` from 5.2.0 to 5.2.1.

Updates `org.mongodb:mongodb-driver-sync` from 5.2.0 to 5.2.1
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.2.0...r5.2.1)

Updates `org.mongodb:mongodb-driver-reactivestreams` from 5.2.0 to 5.2.1
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.2.0...r5.2.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>
2024-11-10 00:42:00 +00:00
dependabot[bot]
d64232cf66 Bump org.apache.groovy:groovy-bom from 4.0.23 to 4.0.24 (#9645)
Bumps [org.apache.groovy:groovy-bom](https://github.com/apache/groovy) from 4.0.23 to 4.0.24.
- [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>
2024-11-10 00:41:45 +00:00
Artem Bilan
c88e28c853 Add update-version-on-website.yml GHA to test website update 2024-11-08 15:42:15 -05:00
Artem Bilan
1d85d6b43c GH-9633: MailReceiver: also set flags into IntegrationMimeMessage
Fixes: #9633
Issue link: https://github.com/spring-projects/spring-integration/issues/9633

The message flags of the received messages are outdated and don't contain the changes of `AbstractMailReceiver#setMessageFlags`,
because the flags are only applied to the original message and not the copy (`AbstractMailReceiver.IntegrationMimeMessage`).

* Call `setMessageFlagsAndMaybeDeleteMessages()` for `IntegrationMimeMessage` copies as well

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
2024-11-06 10:56:06 -05:00
Artem Bilan
846d655084 Increase await() timeout for 30 seconds in MQTT tests
**Auto-cherry-pick to `6.3.x` & `6.2.x`**
2024-11-04 16:20:51 -05:00
dependabot[bot]
3dab443612 Bump com.fasterxml.jackson:jackson-bom from 2.18.0 to 2.18.1 (#9627)
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.18.0 to 2.18.1.
- [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.18.0...jackson-bom-2.18.1)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson:jackson-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>
2024-11-03 02:08:04 +00:00
dependabot[bot]
a34b36e79e Bump com.github.spotbugs in the development-dependencies group (#9626)
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


Updates `com.github.spotbugs` from 6.0.25 to 6.0.26

---
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>
2024-11-03 01:50:07 +00:00
dependabot[bot]
8d7596c79d Bump io.lettuce:lettuce-core from 6.4.0.RELEASE to 6.4.1.RELEASE (#9628)
Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.4.0.RELEASE to 6.4.1.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/redis/lettuce/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.4.0.RELEASE...6.4.1.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>
2024-11-03 00:45:06 +00:00
Artem Bilan
143c1eee3e Fix ImapMailReceiverTests according to the latest codebase 2024-10-31 17:12:30 -04:00
Artem Bilan
e554b67eed GH-9613: Expose AbstractMailReceiver.setFlaggedAsFallback()
Fixes: #9613
Issue link: https://github.com/spring-projects/spring-integration/issues/9613

Sometimes even if `\Recent` or user flag is not supported by mail server, the `\Flagged` is also undesirable

* Expose `AbstractMailReceiver.setFlaggedAsFallback()` to disable setting `\Flagged` on the message as fallback
* As well as expose `MailInboundChannelAdapterSpec.flaggedAsFallback()`
* Document the new option
2024-10-31 16:47:31 -04:00
Artem Bilan
ba57ee8a1b GH-9623: Fix ThreadStatePropagationChannelInterceptor for concurrency
Fixes: #9623
Issue link: https://github.com/spring-projects/spring-integration/issues/9623

The `ConcurrentModificationException` is thrown from the `ThreadStatePropagationChannelInterceptor.MessageWithThreadState.stateQueue`
which is a not thread-safe `LinkedList`

* Fix `ThreadStatePropagationChannelInterceptor.MessageWithThreadState.stateQueue` to be a `LinkedBlockingQueue` instead

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
2024-10-31 13:23:44 -04:00
Artem Bilan
0d2595ef7c GH-9620: Use Locale.ROOT for neutral, case insensitive comparisons
Fixes: #9620
Issue link: https://github.com/spring-projects/spring-integration/issues/9620

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
2024-10-31 10:59:05 -04:00
Artem Bilan
ff2b295be8 Fix version in ListenableFuture removal warning message 2024-10-30 16:28:26 -04:00
Eddie Cho
bab7e8d579 DefaultLockRepository: Use == 1 for delete and renew query results
Some claim that it might improve code readability.
2024-10-30 16:01:04 -04:00
Artem Bilan
b50c40279a GH-9617: @SuppressWarnings("removal") for ListenableFuture
Fixes: #9617
Issue link: https://github.com/spring-projects/spring-integration/issues/9617

The `ListenableFuture` is marked `forRemoval` in Spring Framework.
So, fix the code base to use `@SuppressWarnings("removal")`.
Also, add a warning into logs that `ListenableFuture` support will be removed in `7.0`.

* Fix JavaDocs where `ListenableFuture` is mentioned in favor of `CompletableFuture`
2024-10-30 15:24:10 -04:00
dependabot[bot]
f423280f77 Bump org.springframework.data:spring-data-bom (#9603)
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.1.0-RC1 to 2024.1.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>
2024-10-30 19:21:59 +00:00
dependabot[bot]
a8057487f5 Bump io.projectreactor:reactor-bom (#9607)
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2024.0.0-RC1 to 2024.0.0-SNAPSHOT.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/commits)

---
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>
2024-10-30 19:06:59 +00:00
Artem Bilan
8dad15bac2 GH-9614: SimpleJsonSerializer: escape only \
Fixes: #9614
Issue link: https://github.com/spring-projects/spring-integration/issues/9614

The `Matcher.quoteReplacement()` escapes `\` as well as `$`.
However, Jackson tries to resolve special symbol from the escaped `$` and fails as `Unrecognized character escape '$' (code 36)`

* Fix `SimpleJsonSerializer.toElement()` to escape only `\`

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
2024-10-30 14:17:41 -04:00
Artem Bilan
745dde1f65 Fiux Checkstyle violation in the MessageBuilderTests 2024-10-29 16:14:16 -04:00