Commit Graph

11573 Commits

Author SHA1 Message Date
Artem Bilan
4ca6164a4e Add merge-dependabot-pr.yml GHA 2023-12-19 10:27:33 -05:00
Artem Bilan
273fde9a5e Revert changes to the dependabot.yml 2023-12-19 09:47:40 -05:00
Artem Bilan
4462a6c90e Dev VS Prod for Dependabot 2023-12-19 09:34:45 -05:00
Artem Bilan
542b748d7e Fix release GHA for more permissions
* Improve `dependabot.yml` to group all only dev deps
* Upgrade only to patch releases
* Fix upgrades label for expected by the Changelog-generator
2023-12-18 18:16:38 -05:00
dependabot[bot]
984441dc81 Bump io.micrometer:micrometer-tracing-bom from 1.2.0 to 1.2.1 (#8816)
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.2.0...v1.2.1)

---
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>
2023-12-18 18:09:49 -05:00
dependabot[bot]
a09b63bc50 Bump com.gradle.enterprise from 3.14.1 to 3.16.1 (#8817)
Bumps com.gradle.enterprise from 3.14.1 to 3.16.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 18:04:55 -05:00
dependabot[bot]
a6befcd560 Bump org.ajoberstar.grgit from 4.1.1 to 5.2.1 (#8815)
Bumps [org.ajoberstar.grgit](https://github.com/ajoberstar/grgit) from 4.1.1 to 5.2.1.
- [Release notes](https://github.com/ajoberstar/grgit/releases)
- [Commits](https://github.com/ajoberstar/grgit/compare/4.1.1...5.2.1)

---
updated-dependencies:
- dependency-name: org.ajoberstar.grgit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 18:04:29 -05:00
dependabot[bot]
75c911a550 Bump org.springframework.data:spring-data-bom from 2023.1.0 to 2023.1.1 (#8813)
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2023.1.0 to 2023.1.1.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2023.1.0...2023.1.1)

---
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>
2023-12-18 18:03:28 -05:00
Artem Bilan
0206b36c75 GH-8808: Upgrade to Smack 4.4.7
Fixes: #8808

Fix `ChatMessageInboundChannelAdapterParserTests` according to a new state of the library.
Looks like there is no more one more `StanzaListener` added to the `XMPPConnection`
internally by the library
2023-12-16 18:59:17 -05:00
dependabot[bot]
a4f03dc6fa Upgrade to AspectJ 1.9.21
Bumps [org.aspectj:aspectjweaver](https://github.com/eclipse/org.aspectj) from 1.9.20.1 to 1.9.21.
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)
2023-12-16 15:50:15 -05:00
dependabot[bot]
6f9168d312 Upgrade to AssertK 0.28.0
Bumps [com.willowtreeapps.assertk:assertk-jvm](https://github.com/willowtreeapps/assertk) from 0.27.0 to 0.28.0.
- [Release notes](https://github.com/willowtreeapps/assertk/releases)
- [Changelog](https://github.com/willowtreeapps/assertk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/willowtreeapps/assertk/compare/v0.27.0...v0.28.0)
2023-12-16 15:47:21 -05:00
dependabot[bot]
57ae605500 Upgrade to Hibernate 6.4.1.Final
Bumps [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm) from 6.3.1.Final to 6.4.1.Final.
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/main/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/6.3.1...6.4.1)
2023-12-16 15:45:39 -05:00
dependabot[bot]
a4cbb5e1a8 Upgrade to commons-io 2.15.1
Bumps commons-io:commons-io from 2.15.0 to 2.15.1.

updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-patch
2023-12-16 15:20:42 -05:00
Artem Bilan
fdf3274511 Add dependabot 2023-12-16 14:44:53 -05:00
Artem Bilan
6207bca3bd GH-8806: Ignore HTTP body for DELETE & TRACE
Fixes: #8806

According to RFC 9110, the `TRACE` request must not contain the body and DELETE (like GET and HEAD)
should not.

* Fix `BaseHttpInboundEndpoint` adding `TRACE` & `DELETE` to the `NON_READABLE_BODY_HTTP_METHODS` list
* Clean up typos and links in the `http/inbound.adoc`
2023-12-12 17:25:01 -05:00
Roman Zabaluev
9bd8001a61 GH-8803: RedisLockRegistry: Log for lock acquired
Fixes: #8803

Would be great to have an `Acquired lock; RedisLock...`  logging message as we already have `Released lock; RedisLock ...`

* Improve `RedisLockRegistry.RedisLock.tryRedisLock()` to emit `Acquired lock; RedisLock...` debug message

**Cherry-pick to `6.0.x`**
2023-12-11 17:06:21 -05:00
Artem Bilan
cac5145038 Use ARTIFACTORY secrets for libs-staging-local 2023-12-07 18:02:42 -05:00
Artem Bilan
615691ab11 Clean up #2 2023-12-07 17:28:32 -05:00
Artem Bilan
b94a0ca6b3 Clean up 2023-12-07 17:22:18 -05:00
Artem Bilan
5bf94c68a9 Add jf gradlec for verify staging WF 2023-12-07 16:10:51 -05:00
Artem Bilan
6a9632e2ba Use jf to run Gradle (for possible auth) 2023-12-07 16:08:36 -05:00
Artem Bilan
9e8f395098 Bring back JFrog for verify staging
We need to auth for Artifactory before pulling from `https://repo.spring.io/libs-staging-local`
2023-12-07 16:04:26 -05:00
Artem Bilan
a2c264f51f Fix verify staging WF without JFrog 2023-12-07 15:46:48 -05:00
Artem Bilan
a733935ef1 Rework verify staging WF for Gradle init script
**Cherry-pick to `6.1.x`**
2023-12-07 15:44:19 -05:00
Artem Bilan
940ec888f7 Add new line in the end of FileTailMessProdTests
**Cherry-pick to `6.1.x`**
2023-12-06 13:27:36 -05:00
Artem Bilan
a6f826e1cf Remove unused imports from FileTailMessProdTests
The Checkstyle violation for unused imports in the `FileTailingMessageProducerTests`
Leftover from the previous fix for this class

**Cherry-pick to `6.1.x`**
2023-12-06 13:11:57 -05:00
Artem Bilan
a3d347eddd Fix FileTailingMessProducerTests for tail events
The `OSDelegatingFileTailingMessageProducer` publishes event from scheduled task

* Modify `FileTailingMessageProducerTests.testGuts()` to use `CountDownLatch`
to wait for those asynchronous events

**Cherry-pick to `6.1.x`**
2023-12-06 12:56:07 -05:00
Artem Bilan
9db838eaee Fix Build Status Badge in README for GH Actions 2023-12-06 12:23:08 -05:00
Artem Bilan
c7e3a7c24a GH-8800: Fix SMB Gateway for recursive MGET
Fixes: gh-8800

The `SmbFile.getName()` returns plain file name, not with a
sub-directory as it is expected by the `AbstractRemoteFileOutboundGateway`
for (S)FTP protocols

* Introduce `AbstractRemoteFileOutboundGateway.getFullFileName()`
with dir and file name concatenation by default (as it was before)
and override it in the `SmbOutboundGateway` to return the full path according this protocol.
* Fix `SmbOutboundGateway.enhanceNameWithSubDirectory()` to return an `SmbFile` instance
since it has all the info about remote file, include requested directory
* Fix `SmbOutboundGateway.getFilename()` to remove the trailing `/` in the dir name
since this is not what expected by the `AbstractRemoteFileOutboundGateway` logic

**Cherry-pick to `6.1.x`**
2023-12-06 17:29:28 +01:00
Artem Bilan
6d2bf330d1 Add backport-issue.yml GHA workflow 2023-12-06 10:28:11 -05:00
Artem Bilan
ba287aeb5b GH-8797: Fix DefSftpSessionFactory.timeout logic
Fixes https://github.com/spring-projects/spring-integration/issues/8797

After migration to Apache MINA we have missed to fix `DefaultSftpSessionFactory.timeout`
to be `0` by default as it states in its Javadocs and reference manual
It is `null` by default which really means an infinite wait.

* Fix `DefaultSftpSessionFactory.timeout` to be a reasonable 30 seconds by default
* Fix `setTimeout()` Javadocs and respective `session-factory.adoc`
* Propagate this `timeout` down to the `SftpClient` for its commands interactions
2023-12-04 13:30:33 +01:00
Artem Bilan
9f7acd7d9d Add explicit ref to verify-staged-artifacts.yml
**Cherry-pick to `6.1.x`**
2023-12-01 17:34:57 -05:00
Artem Bilan
504212592e Migrate CI/CD to GitHub Actions
* Remove JFrog plugin since it is supplied from CI/CD by Gradle init script
* Remove Sonar and Jacoco since we don't manage those service anymore
2023-12-01 16:40:40 -05:00
Artem Bilan
b0194e955e Change developer emails 2023-11-28 12:06:22 -05:00
Spring Builds
fd8e0368fb [artifactory-release] Next development version 2023-11-21 20:31:05 +00:00
Spring Builds
10bb183c05 [artifactory-release] Release version 6.2.0 2023-11-21 20:31:02 +00:00
Artem Bilan
52030de72a Upgrade to Spring GraphQL 1.2.4 2023-11-21 13:28:32 -05:00
Artem Bilan
e18d4ebdbb Bring back previous Derby version
Looks like the latest one available is already compiled against Java `21`
2023-11-20 18:49:49 -05:00
Artem Bilan
7428d0b9b2 Upgrade dependencies 2023-11-20 18:30:00 -05:00
Artem Bilan
10a764729c Fix MessageDrivenAdapterTests for partitions
Related to https://github.com/spring-projects/spring-kafka/issues/2891

Starting with Spring for Apache Kafka `3.1`, the `ackMode` for
listener container is coerced to `MANUAL` if no `groupId` assigned
2023-11-18 10:19:41 -05:00
Artem Bilan
22c4db291b GH-8792: Fix File StreamingMS for one file filter
Fixes https://github.com/spring-projects/spring-integration/issues/8792

1. Use a `SftpStreamingMessageSource` with a `maxFetchSize = 5` and a `ChainFileListFilter` filter composed with
`SftpSystemMarkerFilePresentFileListFilter` which `supportsSingleFileFiltering == false`
2. Put 2 files in the folder and invoke `SftpStreamingMessageSource.receive()` method twice.
3. Put 5 files in the folder and invoke `SftpStreamingMessageSource.receive()`` method five times.
4. The last two files won't be received.

When you set max fetch size to a number bigger than one (for example 5) and at a certain point
it is necessary to `this.toBeReceived.clear()` inside `AbstractRemoteFileStreamingMessageSource.doReceive()`,
those removed elements from toBeReceived are not rolled back.

* Fix `AbstractRemoteFileStreamingMessageSource.listFiles()` to calculate `maxFetchSize` as `getMaxFetchSize() - this.fetched.get()`

**Cherry-pick to `6.1.x`, `6.0.x` & `5.5.x`**
2023-11-17 16:39:02 -05:00
Artem Bilan
d95bc681dd GH-8786: Make FtpSession.finalizeRaw() robust
Fixes https://github.com/spring-projects/spring-integration/issues/8786

If `FtpSession.readRaw()` fails, the next `FtpSession.finalizeRaw()` call
would lead to `FTPClient.completePendingCommand()` failure since
there is no command to finish.

* Fix `FtpSession.finalizeRaw()` to exit earlier positively in case of
`FTPReply.isNegativePermanent()` for the current reply code set by the failure
from a previous `FtpSession.readRaw()`

**Cherry-pick to `6.1.x`, `6.0.x` & `5.5.x`**
2023-11-14 09:03:02 +01:00
Artem Bilan
264b21eda7 Fix condition in build.gradle 2023-11-13 17:07:30 -05:00
Artem Bilan
cfce3d027f Some build.gradle optimization
* Move `api project(':spring-integration-core')` to the common `dependencies` section
* Remove redundant `exclude group: 'org.springframework'`
* Add some required deps for `CassandraContainer`
2023-11-13 16:48:12 -05:00
Artem Bilan
87a0705985 Fix race condition in HazelcastMetadataStoreTests
The listener on `IMap` is called in async manner.

* Add `await().untilAsserted()` for the first `verify(listener)`
* Migrate this `HazelcastMetadataStoreTests` to JUnit 5
2023-11-13 15:26:37 -05:00
Gary Russell
4f86320228 Increase Timeouts in FTP RotatingServersTests
Some unknown delays on MacOS cause the tests to fail.
2023-11-13 14:35:13 -05:00
Artem Bilan
537add5cf0 GH-8785: Propagate WebSocket client connect fail
Fixes https://github.com/spring-projects/spring-integration/issues/8785

The `ClientWebSocketContainer.start()` delegates to the `IntegrationWebSocketConnectionManager`
which performs an async connection to the server.

* Wait for `connectionLatch` in the `ClientWebSocketContainer.start()`
and check for `this.openConnectionException != null` to re-throw.
Mark `ClientWebSocketContainer` as stopped in that case

**Cherry-pick to `6.1.x` & `6.0.x`**
2023-11-09 13:08:28 +01:00
Mattias
bcfd81abba Fix sample in sftp/streaming.adoc
* Add missing `/` between the path and filename.
2023-11-08 09:54:09 -05:00
Artem Bilan
96adc08ad8 Adapt AMQP tests to latest Rabbit Streams Client
Related to https://github.com/spring-projects/spring-amqp/issues/2522

No need to use an `AddressResolver` with the latest RabbitMQ Streams Client library
The current configuration is reflecting whatever Spring Boot auto-configuration experience
would expect from us
2023-11-06 15:14:52 -05:00
Artem Bilan
a8b9a3d844 Upgrade dependencies
* Upgrade to the latest Gradle
* Upgrade to the latest Antora libraries
* Move Spring deps to SNAPSHOTs
* Fix deprecation in the AMQP test
2023-11-06 15:10:48 -05:00