Commit Graph

11941 Commits

Author SHA1 Message Date
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
Artem Bilan
44d035fcaa GH-9594: Fix FileReadingMessageSource for FileHeaders.RELATIVE_PATH
Fixes: #9594
Issue link: https://github.com/spring-projects/spring-integration/issues/9594

The `String.replaceFirst()` for directory with `[]` or `()` leads to a regex execution
which does not really replace the root path because of mismatch between regex and file path.
Essentially, the `Matcher.quoteReplacement()` does not do the trick we would expect from it.

* Use `Path.relativize()` API instead which works in canonical paths and proper file separators

(cherry picked from commit 91494094ac)
2024-10-25 17:30:13 +00:00
Artem Bilan
eab39c0b0b Upgrade WFs from main to v4
The `v3` has to be updated by Dependabot automatically

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

# Conflicts:
#	.github/workflows/announce-milestone-planning.yml
2024-10-23 14:43:22 -04:00
Spring Builds
a064acd941 [artifactory-release] Next development version 2024-10-23 13:06:13 +00:00
Spring Builds
e4f8f669d7 [artifactory-release] Release version 6.3.5 2024-10-23 13:06:10 +00:00
dependabot[bot]
83d3659edd Bump org.springframework.graphql:spring-graphql from 1.3.2 to 1.3.3 (#9591)
Bumps [org.springframework.graphql:spring-graphql](https://github.com/spring-projects/spring-graphql) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/spring-projects/spring-graphql/releases)
- [Commits](https://github.com/spring-projects/spring-graphql/compare/v1.3.2...v1.3.3)

---
updated-dependencies:
- dependency-name: org.springframework.graphql:spring-graphql
  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-23 12:29:56 +00:00
dependabot[bot]
f2043624d9 Bump org.springframework.security:spring-security-bom (#9584)
Bumps the development-dependencies group with 1 update: [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security).


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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-22 16:20:32 +00:00
NaccOll
e3665bf82c GH-9561: Make DelayedMessageWrapper JSON-serializable
Fixes: #9561
PR: https://github.com/spring-projects/spring-integration/pull/9561

The `DelayHandler.DelayedMessageWrapper` cannot be deserialized when using `RedisMessageStore` and JSON serialization:
```
org.springframework.data.redis.serializer.SerializationException: Could not read JSON:Cannot construct instance of `org.springframework.integration.handler.DelayHandler$DelayedMessageWrapper` (no Creators, like default constructor, exist): cannot deserialize from Object value (no delegate- or property-based Creator)
 at [Source: UNKNOWN; byte offset: #UNKNOWN]
	at org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer.deserialize(GenericJackson2JsonRedisSerializer.java:311)
```

* More code clean up and refactoring in the test

(cherry picked from commit 73bb813b53)
2024-10-22 16:04:12 +00:00
dependabot[bot]
a64d01d4da Bump io.micrometer:micrometer-tracing-bom from 1.3.4 to 1.3.5 (#9570)
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.3.4...v1.3.5)

---
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-10-20 15:38:34 +00:00
dependabot[bot]
442f3a31ae Bump org.springframework.data:spring-data-bom from 2024.0.4 to 2024.0.5 (#9574)
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.0.4 to 2024.0.5.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2024.0.4...2024.0.5)

---
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-20 01:25:53 +00:00
dependabot[bot]
5fb8b72785 Bump org.springframework.retry:spring-retry from 2.0.9 to 2.0.10 (#9569)
Bumps [org.springframework.retry:spring-retry](https://github.com/spring-projects/spring-retry) from 2.0.9 to 2.0.10.
- [Release notes](https://github.com/spring-projects/spring-retry/releases)
- [Commits](https://github.com/spring-projects/spring-retry/compare/v2.0.9...v2.0.10)

---
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-10-20 01:21:07 +00:00
dependabot[bot]
a7bda2daa7 Bump org.springframework:spring-framework-bom from 6.1.13 to 6.1.14 (#9571)
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.1.13 to 6.1.14.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.13...v6.1.14)

---
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-10-20 01:00:21 +00:00
dependabot[bot]
61611bcb49 Bump io.projectreactor:reactor-bom from 2023.0.10 to 2023.0.11 (#9572)
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2023.0.10 to 2023.0.11.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2023.0.10...2023.0.11)

---
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-20 00:58:37 +00:00
dependabot[bot]
eaa34d175d Bump graalvmVersion from 23.1.4 to 23.1.5 (#9568)
Bumps `graalvmVersion` from 23.1.4 to 23.1.5.

Updates `org.graalvm.sdk:graal-sdk` from 23.1.4 to 23.1.5
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](https://github.com/oracle/graal/compare/vm-23.1.4...vm-23.1.5)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-20 00:49:29 +00:00
dependabot[bot]
b4c42811a2 Bump io.micrometer:micrometer-bom from 1.13.5 to 1.13.6 (#9573)
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.5 to 1.13.6.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.5...v1.13.6)

---
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-10-20 00:49:16 +00:00
dependabot[bot]
dee274fc7f Bump com.github.spotbugs in the development-dependencies group (#9567)
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


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

---
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-10-20 00:48:57 +00:00
Artem Bilan
d16d432d4a GH-9558: Expose BarrierSpec.discardChannel & triggerTimeout
Fixes: #9558
Issue link: https://github.com/spring-projects/spring-integration/issues/9558

(cherry picked from commit e1cebafa5c)
2024-10-18 20:06:32 +00:00
dependabot[bot]
bc844dd49b Bump com.esotericsoftware:kryo from 5.6.0 to 5.6.2 (#9550)
Bumps [com.esotericsoftware:kryo](https://github.com/EsotericSoftware/kryo) from 5.6.0 to 5.6.2.
- [Release notes](https://github.com/EsotericSoftware/kryo/releases)
- [Commits](https://github.com/EsotericSoftware/kryo/compare/kryo-parent-5.6.0...kryo-parent-5.6.2)

---
updated-dependencies:
- dependency-name: com.esotericsoftware:kryo
  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-13 00:09:45 +00:00
dependabot[bot]
0beeb827f9 Bump org.apache.tomcat.embed:tomcat-embed-websocket (#9549)
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.30 to 10.1.31

---
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-10-13 00:07:37 +00:00
Filip Hrisafov
1dafc0f7de GH-9546: IMAP: Flag messages after messages have been copied
Fixes: #9546
Issue link: https://github.com/spring-projects/spring-integration/pull/9546

Sometimes the IMAP connection breaks just after the message flags have been set, but the message has not been copied yet.
This then leads to the message never being received by (as it has been flagged and the next search will not return it).

* Flag and maybe delete messages after messages have been copied

**Auto-cherry-pick to `6.2.x`**
# Conflicts:
#	spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
2024-10-11 13:56:20 -04:00
Artem Bilan
784269c0da Increase timeout in the MethodInvokingMessageHandlerTests
(cherry picked from commit 01c04fb87c)
2024-10-09 20:27:57 +00:00
Alexandr
288e0e885e GH-9540: Add RedisLockRegistry.idleBetweenTries property
Fixes: #9540
2024-10-09 15:21:14 -04:00
dependabot[bot]
5398c5d93b Bump the development-dependencies group with 2 updates (#9534)
Bumps the development-dependencies group with 2 updates: com.github.spotbugs and [io.spring.develocity.conventions](https://github.com/spring-io/develocity-conventions).


Updates `com.github.spotbugs` from 6.0.23 to 6.0.24

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

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: io.spring.develocity.conventions
  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-10-06 02:46:38 +00:00
dependabot[bot]
4f7e4d2441 Bump io.micrometer:micrometer-bom from 1.13.4 to 1.13.5 (#9536)
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.4 to 1.13.5.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.4...v1.13.5)

---
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-10-06 00:56:18 +00:00
dependabot[bot]
8f7acf944d Bump com.icegreen:greenmail from 2.1.0-rc-1 to 2.1.0 (#9537)
Bumps [com.icegreen:greenmail](https://github.com/greenmail-mail-test/greenmail) from 2.1.0-rc-1 to 2.1.0.
- [Release notes](https://github.com/greenmail-mail-test/greenmail/releases)
- [Commits](https://github.com/greenmail-mail-test/greenmail/compare/release-2.1.0-rc-1...release-2.1.0)

---
updated-dependencies:
- dependency-name: com.icegreen:greenmail
  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-06 00:56:00 +00:00
dependabot[bot]
0edb93e6cc Bump org.junit:junit-bom from 5.10.4 to 5.10.5 (#9535)
Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.4 to 5.10.5.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.4...r5.10.5)

---
updated-dependencies:
- dependency-name: org.junit:junit-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-06 00:55:01 +00:00
dependabot[bot]
0f6266a945 Bump org.junit:junit-bom from 5.10.3 to 5.10.4 (#9514)
Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.3 to 5.10.4.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.10.4)

---
updated-dependencies:
- dependency-name: org.junit:junit-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-09-29 00:27:44 +00:00
dependabot[bot]
873635afbe Bump org.apache.avro:avro from 1.11.3 to 1.11.4 (#9513)
Bumps org.apache.avro:avro from 1.11.3 to 1.11.4.

---
updated-dependencies:
- dependency-name: org.apache.avro:avro
  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-09-29 00:20:34 +00:00
dependabot[bot]
95238d2b37 Bump org.codelibs:jcifs from 2.1.38 to 2.1.39 (#9511)
Bumps [org.codelibs:jcifs](https://github.com/codelibs/jcifs) from 2.1.38 to 2.1.39.
- [Commits](https://github.com/codelibs/jcifs/compare/jcifs-2.1.38...jcifs-2.1.39)

---
updated-dependencies:
- dependency-name: org.codelibs:jcifs
  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-09-29 00:18:28 +00:00
dependabot[bot]
b54e2faec8 Bump com.github.spotbugs in the development-dependencies group (#9510)
Bumps the development-dependencies group with 1 update: com.github.spotbugs.


Updates `com.github.spotbugs` from 6.0.22 to 6.0.23

---
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-09-29 00:17:59 +00:00
Martin Tomik
fd80c55d77 GH-9492: Honor @Nested in @SpringIntegrationTest
Fixes: #9492
Issue link: https://github.com/spring-projects/spring-integration/issues/9492

Switches `MockIntegrationContextCustomizerFactory` & `SpringIntegrationTestExecutionListener`
to use `TestContextAnnotationUtils` in order to properly support
`@NestedTestConfiguration` semantics.

Adds an integration test with a base class and several
`@Nested` inner test classes to verify the various
permutations of `@SpringIntegrationTest` inherit/override
behavior when used w/ `@NestedTestConfiguration`.

(cherry picked from commit 3a8e3abc7d)
2024-09-27 14:48:45 +00:00
Artem Bilan
a83b1002a4 Migrate to DEVELOCITY_ACCESS_KEY secret for GHA
(cherry picked from commit 614ea69526)
2024-09-20 21:00:43 +00:00
Artem Bilan
2aec620b39 Migrate to DEVELOCITY_ACCESS_KEY secret for GHA workflows
(cherry picked from commit 430094f4b2)
2024-09-18 20:37:54 +00:00
Artem Bilan
31090da79a GH-9489: Remove Content-Length HTTP before sending GET request
Fixes: #9489
Issue link: https://github.com/spring-projects/spring-integration/issues/9489

If request message has a `Content-Length` HTTP, it is still mapped to the target HTTP request
even if that one is indicated as "no-body" (`GET`, `HEAD`, `TRACE`).
In this case Netty fails to decode such a missed body with error:
```
java.lang.IllegalArgumentException: text is empty (possibly HTTP/0.9)), version: HTTP/1.0
```

* Since `Content-Length` is not supposed to be supported for those methods,
remove it altogether from the HTTP request headers
* Add nullability API into the `org.springframework.integration.http.outbound`
* Check received HTTP request on the server side that it does not have such a header for `GET`

(cherry picked from commit 891dca7179)
2024-09-18 17:50:10 +00:00
Spring Builds
5d65797395 [artifactory-release] Next development version 2024-09-17 22:49:45 +00:00
Spring Builds
a2cae1892e [artifactory-release] Release version 6.3.4 2024-09-17 22:49:42 +00:00
Artem Bilan
de1b5f8fef Remove com.gradle.develocity plugin
The plugin is managed transitively by the `io.spring.develocity.conventions` since version `0.0.21`

(cherry picked from commit 725e66004c)
2024-09-17 21:06:11 +00:00
dependabot[bot]
be91fd31aa Bump org.springframework.kafka:spring-kafka-bom from 3.2.3 to 3.2.4 (#9486)
Bumps [org.springframework.kafka:spring-kafka-bom](https://github.com/spring-projects/spring-kafka) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/spring-projects/spring-kafka/releases)
- [Commits](https://github.com/spring-projects/spring-kafka/compare/v3.2.3...v3.2.4)

---
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-09-17 20:43:13 +00:00
dependabot[bot]
e5786dbec3 Bump org.apache.tomcat.embed:tomcat-embed-websocket (#9484)
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.29 to 10.1.30

---
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-09-17 20:42:50 +00:00
Artem Bilan
229ffb7a11 GH-9481: Fix JdbcMetadataStore for PostgreSQL & MySQL
Fixes: #9481
Issue link: https://github.com/spring-projects/spring-integration/issues/9481

MySQL throws `CannotAcquireLockException` in case of duplicate key failure.
PostgreSQL just rollbacks a transaction not letting us move on with a `SELECT`

* Include `TransientDataAccessException` to the catch block of the `INSERT`
to ignore it for the subsequent `SELECT`
* Add logic to determine `PostgreSQL` database vendor and include `ON CONFLICT DO NOTHING`
hint into the `INSERT` to not fail in case of duplicate key found on `putIfAbsent` operation

(cherry picked from commit 98d0266ba0)
2024-09-17 19:22:35 +00:00