Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,980 Commits 25 Branches 0 Tags
d9a4e8cb0c73684e09237bb0f718015a4a2d5b0a
Commit Graph

11980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
d9a4e8cb0c Bump com.github.spotbugs in the development-dependencies group (#9750) 
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


Updates `com.github.spotbugs` from 6.0.27 to 6.0.28

---
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-01-11 21:37:59 -05:00
Artem Bilan
04264ef072 GH-9745: IntEvalCtxFB: Use BeanFactory's ClassLoader 
Fixes: #9745
Issue link: https://github.com/spring-projects/spring-integration/issues/9745

The `IntegrationEvaluationContextFactoryBean` does not provide a `TypeLocator` by default.
That may lead to a class-not-found problem from different `ClassLoader` in the parallel Java `Stream` executor.

* Fix `IntegrationEvaluationContextFactoryBean` to use a `StandardTypeLocator` based on the `applicationContext.getClassLoader()`

(cherry picked from commit 6184c4082a)

# Conflicts:
#	spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationEvaluationContextFactoryBean.java
 2025-01-09 16:38:43 -05:00
dependabot[bot]
e894b5d2f0 Bump com.github.spotbugs in the development-dependencies group (#9740) 
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


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

---
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-12-21 19:34:34 -05:00
Spring Builds
5a88046b8e [artifactory-release] Next development version 2024-12-17 19:29:03 +00:00
Spring Builds
fb0a6d9fd1 [artifactory-release] Release version 6.3.7 2024-12-17 19:29:02 +00:00
Artem Bilan
ef3ee8f427 GH-9711: Avoid double URL encoding in SmbShare 
Fixes: #9711
Issue link: https://github.com/spring-projects/spring-integration/issues/9711

The `SmbConfig.getUrl(_includePassword)` uses `URI.toASCIIString()` which has all the parts of the URI encoded.
Then this string is used by the `SmbShare` for its super constructor, which, in turn, calls `new URL()`
leading, essentially, to a second encoding round.

* Add `SmbConfig.rawUrl()` methods to return an `smb://` url as a plain string.
* Use this new API in the `SmbShare` for a delegation constructor
* Modify some tests to reflect and cover new behavior

(cherry picked from commit 5e3d8d890a)
 2024-12-17 18:07:13 +00:00
dependabot[bot]
04845b0561 Bump the development-dependencies group with 2 updates (#9731) 
Bumps the development-dependencies group with 2 updates: [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) and io.spring.dependency-management.


Updates `org.springframework.security:spring-security-bom` from 6.3.5 to 6.3.6
- [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.5...6.3.6)

Updates `io.spring.dependency-management` from 1.1.6 to 1.1.7

---
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: io.spring.dependency-management
  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-17 11:43:24 +00:00
dependabot[bot]
0163ed4167 Bump org.springframework.kafka:spring-kafka-bom from 3.2.5 to 3.2.6 (#9734) 
Bumps [org.springframework.kafka:spring-kafka-bom](https://github.com/spring-projects/spring-kafka) from 3.2.5 to 3.2.6.
- [Release notes](https://github.com/spring-projects/spring-kafka/releases)
- [Commits](https://github.com/spring-projects/spring-kafka/compare/v3.2.5...v3.2.6)

---
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>
 2024-12-17 11:28:22 +00:00
dependabot[bot]
f8600bbf15 Bump org.springframework.retry:spring-retry from 2.0.10 to 2.0.11 (#9719) 
Bumps [org.springframework.retry:spring-retry](https://github.com/spring-projects/spring-retry) from 2.0.10 to 2.0.11.
- [Release notes](https://github.com/spring-projects/spring-retry/releases)
- [Commits](https://github.com/spring-projects/spring-retry/compare/v2.0.10...v2.0.11)

---
updated-dependencies:
- dependency-name: org.springframework.retry:spring-retry
  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-15 01:13:18 +00:00
dependabot[bot]
9aafc0a173 Bump io.micrometer:micrometer-tracing-bom from 1.3.6 to 1.3.7 (#9720) 
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.3.6...v1.3.7)

---
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>
 2024-12-15 01:01:10 +00:00
dependabot[bot]
d8f65b2776 Bump org.springframework:spring-framework-bom from 6.1.15 to 6.1.16 (#9722) 
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.1.15 to 6.1.16.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.15...v6.1.16)

---
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>
 2024-12-15 00:57:49 +00:00
dependabot[bot]
74b0ff2437 Bump io.projectreactor:reactor-bom from 2023.0.12 to 2023.0.13 (#9718) 
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2023.0.12 to 2023.0.13.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2023.0.12...2023.0.13)

---
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-12-15 00:56:34 +00:00
dependabot[bot]
7f2e9577f2 Bump org.springframework.data:spring-data-bom from 2024.0.6 to 2024.0.7 (#9717) 
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.0.6 to 2024.0.7.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2024.0.6...2024.0.7)

---
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-12-15 00:48:44 +00:00
dependabot[bot]
f65ab28ac2 Bump io.micrometer:micrometer-bom from 1.13.8 to 1.13.9 (#9721) 
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.8...v1.13.9)

---
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-12-15 00:47:27 +00:00
dependabot[bot]
34ee1e437a Bump org.apache.tomcat.embed:tomcat-embed-websocket (#9716) 
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.33 to 10.1.34

---
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-12-15 00:46:57 +00:00
Falk Hanisch
ea441ff827 GH-9713: Add @Nullable to IntegrationEvent.getCause() 
Fixes: #9713

(cherry picked from commit c677fc56f2)
 2024-12-13 02:34:06 +00:00
Artem Bilan
4bb46246df GH-9684: Auto-create temporary remote directory 
Fixes: #9684
Issue link: https://github.com/spring-projects/spring-integration/issues/9684

The `RemoteFileTemplate` is missing to create a temporary remote directory

* Fix `RemoteFileTemplate.sendFileToRemoteDirectory()` to create a `temporaryRemoteDirectory`
as well if it is different from already created `remoteDirectory`
* Add `SftpServerOutboundTests.autoCreateTemporaryDirectory()` to verify that `temporaryRemoteDirectory` is created and in-use
* Some other `SftpServerOutboundTests` refactoring for better code style

(cherry picked from commit a4b193fa64)
 2024-12-12 22:31:35 +00:00
Artem Bilan
d8fb02306f GH-9709: Fix IntegrationFlow for input channel resolution 
Fixes: #9709
Issue link: https://github.com/spring-projects/spring-integration/issues/9709

The Java DSL loses an `inputChannel` when existing channel is referenced by its name.
Then the target IntegrationFlow does not contain a bean reference for this channel and when we call its `getInputChannel()` we got something from middle of the flow.
However, that `inputChannel` is really expected to be an input for the flow.

* Fix `IntegrationFlowBeanPostProcessor` to get a bean by `MessageChannelReference` and populate it into `targetIntegrationComponents`
as we do for newly created `DirectChannel` if there is no bean for provided `MessageChannelReference`

# Conflicts:
#	spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java
 2024-12-10 16:46:35 -05:00
Mitchell
1071c3c082 GH-9705: AbstractReplyProducingMessageHandler: check for logging enabled 
Fixes: #9705
Issue link: https://github.com/spring-projects/spring-integration/issues/9705

Currently when any class that implements `AbstractReplyProducingMessageHandler` doesn't produce a reply it will log the message, even if no reply is required.
The message should only be logged if `isLoggingEnabled()` returns true as a handler that doesn't require a reply may be a normal operation that is expected, and if we've set `loggingEnabled` to false it shouldn't log the message.

* Prevent logging when no reply is provided for an `AbstractReplyProducingMessageHandler` if logging is disabled

(cherry picked from commit 7fc104ac8b)
 2024-12-10 15:02:42 +00:00
Artem Bilan
a10814d1e2 Fix Javadoc style errors in the CheckedCallable 
(cherry picked from commit dd7dd09d00)
 2024-12-09 18:28:17 +00:00
Artem Bilan
9fffb5b664 GH-9702: Add CheckedCallable.uncheckedCallable 
Fixes: #9702
Issue link: https://github.com/spring-projects/spring-integration/issues/9702

The current `CheckedCallable.unchecked()` returns `Runnable`, which is not an expectation.

* Deprecate `CheckedCallable.unchecked()` in favor of newly introduced `CheckedCallable.uncheckedCallable()`.
We cannot call it `unchecked()` as well, since `Callable` after erasure becomes similar to class signature as `Runnable`.

(cherry picked from commit 8c22bf6430)
 2024-12-09 18:18:03 +00:00
Jooyoung Pyoung
1d66863e0d GH-9694: Remove duplicate SocketChannel initialization 
Fixes: #9694
Issue link: https://github.com/spring-projects/spring-integration/issues/9694

- Add null check before closing `socketChannel` in catch block
- Prevents potential `NullPointerException` during error handling
 2024-12-06 17:04:02 -05:00
Artem Bilan
f56f5cf76b 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`

(cherry picked from commit 2cf83b5311)
 2024-12-05 18:59:26 +00:00
dependabot[bot]
857f703877 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:10 -05:00
Spring Builds
22abc797d0 [artifactory-release] Next development version 2024-11-19 23:12:14 +00:00
Spring Builds
f485e4ed4b [artifactory-release] Release version 6.3.6 2024-11-19 23:12:14 +00:00
dependabot[bot]
099195ddb5 Bump spring-io/spring-github-workflows (#9668) 
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 18:04:29 +00:00
dependabot[bot]
189a944e59 Bump org.springframework.kafka:spring-kafka-bom from 3.2.4 to 3.2.5 (#9673) 
Bumps [org.springframework.kafka:spring-kafka-bom](https://github.com/spring-projects/spring-kafka) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/spring-projects/spring-kafka/releases)
- [Commits](https://github.com/spring-projects/spring-kafka/compare/v3.2.4...v3.2.5)

---
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>
 2024-11-19 17:45:55 +00:00
dependabot[bot]
2b498dbcfc Bump the development-dependencies group with 2 updates (#9671) 
Bumps the development-dependencies group with 2 updates: [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) and [com.icegreen:greenmail](https://github.com/greenmail-mail-test/greenmail).


Updates `org.springframework.security:spring-security-bom` from 6.3.4 to 6.3.5
- [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.4...6.3.5)

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: org.springframework.security:spring-security-bom
  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>
 2024-11-19 17:12:47 +00:00
dependabot[bot]
cdd5f67e05 Bump org.springframework.amqp:spring-amqp-bom from 3.1.7 to 3.1.8 (#9677) 
Bumps [org.springframework.amqp:spring-amqp-bom](https://github.com/spring-projects/spring-amqp) from 3.1.7 to 3.1.8.
- [Release notes](https://github.com/spring-projects/spring-amqp/releases)
- [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.1.7...v3.1.8)

---
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>
 2024-11-19 17:01:57 +00:00
dependabot[bot]
7b6abde09a Bump io.projectreactor:reactor-bom from 2023.0.11 to 2023.0.12 (#9659) 
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2023.0.11 to 2023.0.12.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2023.0.11...2023.0.12)

---
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-11-17 02:00:00 +00:00
dependabot[bot]
1a9d42a661 Bump io.micrometer:micrometer-tracing-bom from 1.3.5 to 1.3.6 (#9660) 
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.3.5 to 1.3.6.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.3.5...v1.3.6)

---
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>
 2024-11-17 01:13:04 +00:00
dependabot[bot]
006ee32709 Bump org.springframework:spring-framework-bom from 6.1.14 to 6.1.15 (#9661) 
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.1.14 to 6.1.15.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.14...v6.1.15)

---
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>
 2024-11-17 00:57:23 +00:00
dependabot[bot]
8a7abb7bed Bump org.springframework.data:spring-data-bom from 2024.0.5 to 2024.0.6 (#9658) 
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.0.5 to 2024.0.6.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2024.0.5...2024.0.6)

---
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:48:22 +00:00
dependabot[bot]
353efe996e Bump org.apache.tomcat.embed:tomcat-embed-websocket (#9656) 
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:46:50 +00:00
dependabot[bot]
8aff4dac96 Bump io.micrometer:micrometer-bom from 1.13.6 to 1.13.8 (#9657) 
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.6 to 1.13.8.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.6...v1.13.8)

---
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:46:19 +00:00
Artem Bilan
b959d0d687 More @DirtiesContext for tests in core module 
Additional code style cleanups in the affected classes

**Auto-cherry-pick to `6.2.x`**

# Conflicts:
#	spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java
 2024-11-15 13:46:01 -05:00
Artem Bilan
450dd52fcc 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

(cherry picked from commit 09750f2012)
 2024-11-14 19:50:18 +00:00
dependabot[bot]
9245a9b521 Bump org.apache.groovy:groovy-bom from 4.0.23 to 4.0.24 (#9638) 
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-14 19:49:53 +00:00
dependabot[bot]
daebda892e Bump org.jruby:jruby-complete from 9.4.8.0 to 9.4.9.0 (#9637) 
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 12:22:39 +00:00
dependabot[bot]
7fee683f3a Bump the development-dependencies group with 2 updates (#9636) 
Bumps the development-dependencies group with 2 updates: org.hsqldb:hsqldb and [com.thoughtworks.xstream:xstream](https://github.com/x-stream/xstream).


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

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: 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 00:29:37 +00:00
Artem Bilan
22161b628d 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

(cherry picked from commit 1d85d6b43c)
 2024-11-06 15:56:33 +00:00
Artem Bilan
6eee926e7e Increase await() timeout for 30 seconds in MQTT tests 
**Auto-cherry-pick to `6.2.x`**

# Conflicts:
#	spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java
 2024-11-04 16:25:08 -05:00
dependabot[bot]
9a76ad5cc5 Bump com.fasterxml.jackson:jackson-bom from 2.17.2 to 2.17.3 (#9630) 
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.2 to 2.17.3.
- [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.17.2...jackson-bom-2.17.3)

---
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 00:28:54 +00:00
dependabot[bot]
22954647d2 Bump com.github.spotbugs in the development-dependencies group (#9629) 
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 00:19:29 +00:00
Artem Bilan
34b61002dc 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

(cherry picked from commit ba57ee8a1b)
 2024-10-31 17:24:11 +00:00
Artem Bilan
5c76a47e55 GH-9620: Use Locale.ROOT for neutral, case insensitive comparisons 
Fixes: #9620
Issue link: https://github.com/spring-projects/spring-integration/issues/9620

(cherry picked from commit 0d2595ef7c)
 2024-10-31 14:59:32 +00:00
Artem Bilan
4ffc6641b7 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 `\`

(cherry picked from commit 8dad15bac2)
 2024-10-30 18:18:08 +00:00
dependabot[bot]
d3675291b9 Bump spring-io/spring-github-workflows (#9600) 
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 3 to 4
- [Release notes](https://github.com/spring-io/spring-github-workflows/releases)
- [Commits](https://github.com/spring-io/spring-github-workflows/compare/v3...v4)

---
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-10-26 00:11:27 +00:00
Artem Bilan
fb6e6c63df GH-9597: Fix Mqttv5PahoMessageHandler.publish() for concurrency 
Fixes: #9597
Issue link: https://github.com/spring-projects/spring-integration/issues/9597

When input channel for the endpoint with a `Mqttv5PahoMessageHandler` is an `ExecutorChannel` and a lot of concurrent messages are sent,
the `Connect already in progress (32110)` exception can be thrown

* Wrap `this.mqttClient.connect()` in the `Mqttv5PahoMessageHandler.publish()` into a `Lock`

(cherry picked from commit 334620f36e)
 2024-10-25 20:52:56 +00:00