dependabot[bot]
70ef92aa8a
Bump protobufVersion from 3.25.1 to 3.25.3 ( #8918 )
...
Bumps `protobufVersion` from 3.25.1 to 3.25.3.
Updates `com.google.protobuf:protobuf-java` from 3.25.1 to 3.25.3
- [Release notes](https://github.com/protocolbuffers/protobuf/releases )
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl )
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.1...v3.25.3 )
Updates `com.google.protobuf:protobuf-java-util` from 3.25.1 to 3.25.3
---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.protobuf:protobuf-java-util
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-02-16 22:11:28 +00:00
dependabot[bot]
2ef3c65f27
Bump org.aspectj:aspectjweaver from 1.9.21 to 1.9.21.1 ( #8912 )
...
Bumps [org.aspectj:aspectjweaver](https://github.com/eclipse/org.aspectj ) from 1.9.21 to 1.9.21.1.
- [Release notes](https://github.com/eclipse/org.aspectj/releases )
- [Commits](https://github.com/eclipse/org.aspectj/commits )
---
updated-dependencies:
- dependency-name: org.aspectj:aspectjweaver
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-02-16 22:11:00 +00:00
dependabot[bot]
573618f733
Bump com.icegreen:greenmail from 2.1.0-alpha-3 to 2.1.0-alpha-4 ( #8910 )
...
Bumps [com.icegreen:greenmail](https://github.com/greenmail-mail-test/greenmail ) from 2.1.0-alpha-3 to 2.1.0-alpha-4.
- [Release notes](https://github.com/greenmail-mail-test/greenmail/releases )
- [Commits](https://github.com/greenmail-mail-test/greenmail/compare/release-2.1.0-alpha-3...release-2.1.0-alpha-4 )
---
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-02-16 22:08:43 +00:00
dependabot[bot]
036faa68ce
Bump io.micrometer:micrometer-bom from 1.12.1 to 1.12.3 ( #8911 )
...
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer ) from 1.12.1 to 1.12.3.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases )
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.1...v1.12.3 )
---
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-02-16 22:08:33 +00:00
Artem Bilan
c8ce98c539
Migrate from findbugs to spotbugs
...
**Auto-cherry-pick to 6.1.x`**
2024-02-16 15:02:23 -05:00
Artem Bilan
efa96463d7
Make PR & Dependabot WFs working against support branches
...
(cherry picked from commit 1f4d27d71f )
2024-02-16 19:54:13 +00:00
Artem Bilan
9ae23dc0b8
Optimize BPPs as AopInfrastructureBean
...
There is no need to post-process the framework internal BPPs.
Therefore, mark `GatewayProxyInstantiationPostProcessor`, `GlobalChannelInterceptorProcessor`, `IntegrationFlowBeanPostProcessor`
and `BaseIntegrationFlowDefinition.ReplyProducerCleaner` as an `AopInfrastructureBean`.
This way they are not post-processed via AOP `BeanPostProcessor`
* Migrate `org.springframework.integration.aop` tests to JUnit 5
* Fix race condition in the `FluxMessageChannelTests.noMemoryLeakInFluxMessageChannelForVolatilePublishers()`
where `FluxMessageChannel.upstreamSubscriptions` is updated from a different thread
(cherry picked from commit a8ed1dd9aa )
2024-02-09 22:35:33 +00:00
Artem Bilan
de291d81d1
Upgrade to Gradle 8.6; latest reusable workflows
...
* Add `package-ecosystem: "github-actions"` for Dependabot
2024-02-09 16:10:14 -05:00
Spring Builds
ed67f4ae11
Fix typos in JDBC & JPA docs
...
(cherry picked from commit 92cfd0ed05 )
2024-02-08 23:10:42 +00:00
Spring Builds
f6383f239e
Fix typos and broken links in docs
2024-02-08 17:36:13 -05:00
Artem Bilan
721b7deeae
Fix whats-new.adoc ref in the index.adoc
...
**Auto-cherry-pick to `6.2.x`**
2024-02-08 17:15:39 -05:00
Artem Bilan
2370a749bc
Add auto-cherry-pick.yml GHA workflow
...
**Auto-cherry-pick to `6.1.x`**
2024-02-08 15:35:02 -05:00
Artem Bilan
9ea7581073
GH-8894: Fix race condition in the DelayHandler
...
Fixes : #8894
* Guard `this.messageStore` access in the `DelayHandler` with existing `this.lock`
to avoid `ConcurrentModificationException`
**Cherry-pick to `6.2.x`**
(cherry picked from commit 4b43969438 )
2024-02-07 16:41:36 -05:00
Artem Bilan
d225ddf0bd
GH-8889: FluxMCh: propagate context per message
...
Fixes : #8889
* Gather the current thread local state for the message into `IntegrationMessageHeaderAccessor.REACTOR_CONTEXT` header
before `this.sink.tryEmitNext(messageToEmit)`
* Restore thread locals for the current message in the `ReactiveStreamsConsumer.SubscriberDecorator` just before `this.delegate.onNext(messageToDeliver)`
**Cherry-pick to `6.2.x`**
(cherry picked from commit dbd46dfe3d )
2024-02-07 11:20:41 -05:00
Václav Haisman
623d136527
Fix LogMessage placeholders in MqttHeaderMapper
...
Fixes : #8888
* Fix `LogMessage` formatting placeholders in `MqttHeaderMapper`
**cherry-pick to `6.2.x` & `6.1.x`
(cherry picked from commit 8b877fc887 )
2024-02-07 11:00:38 -05:00
Václav Haisman
57529cc389
GH-8879: Add MQTT subscription identifier
...
Fixes : #8879
To work around the problem with `$share/` subscriptions the `Mqttv5PahoMessageDrivenChannelAdapter` must provide a `subscriptionIdentifier` into `MqttProperties` on `subscribe()`
* Introduce a `Mqttv5PahoMessageDrivenChannelAdapter.subscriptionIdentifierCounter` according to the MQTT specification:
> 3.8.2.1.2 Subscription Identifier: [..]The Subscription Identifier is associated with any subscription created or modified as the result of this SUBSCRIBE packet. If there is a Subscription Identifier, it is stored with the subscription.
This one is associated with the MQTT session for the current subscriber and does not interfere into other sessions even if identifier is same from the counter.
It works because the Subscription identifier is per session and because you cannot have multiple connection with the same client ID.
**Cherry-pick to `6.2.x` & `6.1.x`**
# Conflicts:
# spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
2024-02-02 15:07:09 -05:00
Artem Bilan
c4b8bc767d
GH-8873: Fix on-demand subscription for MQTT v5
...
Fixes : #8873
The `mqttClient.subscribe()` API does not check if properties are provided and fails on the
`subscriptionProperties.getSubscriptionIdentifiers().get(0)` call with an `IndexOutOfBoundsException`
* Use another `mqttClient.subscribe()` API in the `Mqttv5PahoMessageDrivenChannelAdapter` where there is not such a check
* Ensure that `addTopic(NAME)` works as expected in the `Mqttv5BackToBackTests`
**Cherry-pick to `6.2.x` & `6.1.x`**
# Conflicts:
# spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
2024-01-30 17:06:34 -05:00
Neville Bonavia
a73fecf531
GH-8869: Fix NPE in RedisLockRegistry.setExecutor
...
Fixes : #8869
Do not set the `redisMessageListenerContainer`'s executor in the setter method
since the Redis Message Listener container is not initialised during configuration due to lazy loading
**Cherry-pick to `6.2.x` & `6.0.x`**
(cherry picked from commit 62fd3e6c20 )
2024-01-30 13:02:24 -05:00
Soby Chacko
0c83eaf036
Fix 404 issue with the reference docs
...
Due to an antora ordering issue, the reference docs on the latest GA from
the project site throws an HTTP 404.
See spring-projects/spring-framework#32083 for more details.
2024-01-26 17:31:22 -05:00
Artem Bilan
1a3c25b019
Fix phase for TaskScheduler instances in tests
...
Related to: #8856
Many tests create their own `ThreadPoolTaskScheduler` beans.
Therefore, its default phase might affect the memory and performance.
* Use `phase = SmartLifecycle.DEFAULT_PHASE / 2` for manual
`ThreadPoolTaskScheduler` beans
* Migrate affected tests classes to JUnit 5
* Make some other configuration adjustments for better performance
**Cherry-pick to `6.2.x`**
(cherry picked from commit 39c99c0719 )
2024-01-16 11:28:31 -05:00
Artem Bilan
0be2c76530
GH-8856: Adjust phase for TaskScheduler global bean
...
Fixes : #8856
The `ThreadPoolTaskScheduler` in Spring Framework manages now a lifecycle
with a `Integer.MAX_VALUE` phase by default.
This causes a wait block for scheduled tasks in the `AbstractPollingEndpoint` instances.
These tasks are cancelled by in the later `Integer.MAX_VALUE / 2` phase.
So, we have a lifecycle deadlock on context close
* Fix `DefaultConfiguringBeanFactoryPostProcessor.registerTaskScheduler()`
with a `.addPropertyValue("phase", SmartLifecycle.DEFAULT_PHASE / 2)`
to let the `AbstractPollingEndpoint` to cancel its currently scheduled task
to avoid possible pollution with unexpected (and lost) messages
**Cherry-pick to `6.2.x`**
(cherry picked from commit 11e0ea1305 )
2024-01-12 13:52:22 -05:00
Artem Bilan
ab3516cb86
GH-8852: Fix TcpNetServerConnectionFactory.run loop
...
Fixes : #8852
The `while (true) {` causes the thread to be blocked forever.
The `stop()` waits on the `if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) {` the whole time
* Fix with the `while (isActive()) {`
* Remove the `ConnectionFactoryTests.testEarlyCloseNet()` since we cannot reach expectations because of
race condition between `start()` and `stop()`
**Cherry-pick to `6.2.x` & `6.1.x`**
(cherry picked from commit 0b60dfc9d1 )
2024-01-05 15:54:14 -05:00
Artem Bilan
b150f6bfcf
Use spring-dispatch-docs-build.yml
...
**Cherry-pick to `6.2.x`**
(cherry picked from commit b4fc3479d3 )
2023-12-22 14:58:11 -05:00
Artem Bilan
4f2f695cae
Use reusable WF for deploy-docs.yml
...
(cherry picked from commit 85d3284834 )
2023-12-22 13:39:57 -05:00
Artem Bilan
1e79280e31
Improve deploy-docs.yml
...
* Build only against supported branches and tags
* Move `GH_TOKEN` to the common `env` section
(cherry picked from commit 726a59da37 )
2023-12-22 12:20:26 -05:00
Artem Bilan
f96beb3374
Fix compatibility with latest Spring AMQP
2023-12-21 17:54:47 -05:00
Artem Bilan
075613c4a1
Migrate GHAs for repo from Spring IO org
...
**Cherry-pick to `6.1.x`**
2023-12-20 17:03:58 -05:00
Spring Builds
f1dac035fa
[artifactory-release] Next development version
2023-12-19 19:45:06 +00:00
Spring Builds
43474ccc56
[artifactory-release] Release version 6.2.1
2023-12-19 19:45:02 +00:00
Artem Bilan
7abdbecaa4
Make ci-snapshot.yml generic for support branches
2023-12-19 14:02:21 -05:00
dependabot[bot]
164bf00bcd
Bump io.micrometer:micrometer-bom from 1.12.0 to 1.12.1 ( #8829 )
...
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer ) from 1.12.0 to 1.12.1.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases )
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.0...v1.12.1 )
---
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>
2023-12-19 17:49:42 +00:00
dependabot[bot]
33497a4e6f
Bump org.springframework.security:spring-security-bom ( #8830 )
...
Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security ) from 6.2.0 to 6.2.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.2.0...6.2.1 )
---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-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-19 17:41:05 +00:00
Artem Bilan
d8da98136a
Fix deprecation in the KotlinFileAggregatorTests.kt
2023-12-19 12:36:01 -05:00
dependabot[bot]
c992ea74a3
Bump the development-dependencies group with 2 updates ( #8833 )
...
Bumps the development-dependencies group with 2 updates: [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java ) and com.gradle.enterprise.
Updates `org.testcontainers:testcontainers-bom` from 1.19.2 to 1.19.3
- [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.19.2...1.19.3 )
Updates `com.gradle.enterprise` from 3.15 to 3.15.1
---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: development-dependencies
- dependency-name: com.gradle.enterprise
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>
2023-12-19 12:26:14 -05:00
Artem Bilan
eb6764ba06
Use permissions: write-all for merge-dependabot-pr
2023-12-19 12:04:31 -05:00
Artem Bilan
884359b93f
Fix Checksum for Gradle Wrapper
2023-12-19 11:59:31 -05:00
Artem Bilan
d8a336b848
Upgrade to Gradle 8.5
...
* Fix `org.testcontainers` pattern for Dependabot
* Downgrade to `com.gradle.enterprise:3.15`
* Fix deprecation warning in the `KafkaDslKotlinTests.kt`
2023-12-19 11:57:18 -05:00
Artem Bilan
4bf0d1782b
Exclude com.google.code.findbugs from Dependabot
2023-12-19 11:31:54 -05:00
Artem Bilan
ac5a63a2da
Add more permissions for merge-dependabot-pr.yml
2023-12-19 11:28:20 -05:00
dependabot[bot]
c80411e95b
Bump org.springframework.amqp:spring-amqp-bom from 3.1.0 to 3.1.1 ( #8820 )
...
Bumps [org.springframework.amqp:spring-amqp-bom](https://github.com/spring-projects/spring-amqp ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/spring-projects/spring-amqp/releases )
- [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.1.0...v3.1.1 )
---
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>
2023-12-19 11:09:31 -05:00
dependabot[bot]
7d7a78ef65
Bump org.springframework.retry:spring-retry from 2.0.4 to 2.0.5 ( #8824 )
...
Bumps [org.springframework.retry:spring-retry](https://github.com/spring-projects/spring-retry ) from 2.0.4 to 2.0.5.
- [Release notes](https://github.com/spring-projects/spring-retry/releases )
- [Commits](https://github.com/spring-projects/spring-retry/compare/v2.0.4...v2.0.5 )
---
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>
2023-12-19 10:58:21 -05:00
dependabot[bot]
4002eeb691
Bump org.springframework.ws:spring-ws-bom from 4.0.8 to 4.0.9 ( #8825 )
...
Bumps [org.springframework.ws:spring-ws-bom](https://github.com/spring-projects/spring-ws ) from 4.0.8 to 4.0.9.
- [Release notes](https://github.com/spring-projects/spring-ws/releases )
- [Commits](https://github.com/spring-projects/spring-ws/compare/v4.0.8...v4.0.9 )
---
updated-dependencies:
- dependency-name: org.springframework.ws:spring-ws-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-19 10:57:46 -05:00
dependabot[bot]
6482db9ae2
Bump the development-dependencies group with 1 update ( #8819 )
...
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.16 to 10.1.17
---
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>
2023-12-19 10:57:22 -05:00
dependabot[bot]
b5ccd1f9d1
Bump org.jruby:jruby-complete from 9.4.3.0 to 9.4.5.0 ( #8821 )
...
Bumps org.jruby:jruby-complete from 9.4.3.0 to 9.4.5.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>
2023-12-19 10:56:54 -05:00
dependabot[bot]
bcc2554caa
Bump debeziumVersion from 2.4.1.Final to 2.4.2.Final ( #8822 )
...
Bumps `debeziumVersion` from 2.4.1.Final to 2.4.2.Final.
Updates `io.debezium:debezium-embedded` from 2.4.1.Final to 2.4.2.Final
Updates `io.debezium:debezium-connector-mysql` from 2.4.1.Final to 2.4.2.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>
2023-12-19 10:56:00 -05:00
dependabot[bot]
025f2dce77
Bump io.projectreactor:reactor-bom from 2023.0.0 to 2023.0.1 ( #8823 )
...
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor ) from 2023.0.0 to 2023.0.1.
- [Release notes](https://github.com/reactor/reactor/releases )
- [Commits](https://github.com/reactor/reactor/compare/2023.0.0...2023.0.1 )
---
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>
2023-12-19 10:44:14 -05:00
dependabot[bot]
f0dc64584b
Bump org.springframework:spring-framework-bom from 6.1.0 to 6.1.2 ( #8826 )
...
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework ) from 6.1.0 to 6.1.2.
- [Release notes](https://github.com/spring-projects/spring-framework/releases )
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.0...v6.1.2 )
---
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>
2023-12-19 10:40:10 -05:00
dependabot[bot]
e83467f110
Bump org.apache.groovy:groovy-bom from 4.0.15 to 4.0.16 ( #8827 )
...
Bumps [org.apache.groovy:groovy-bom](https://github.com/apache/groovy ) from 4.0.15 to 4.0.16.
- [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>
2023-12-19 10:39:50 -05:00
dependabot[bot]
918fa58e64
Bump org.springframework.kafka:spring-kafka-bom from 3.1.0 to 3.1.1 ( #8828 )
...
Bumps [org.springframework.kafka:spring-kafka-bom](https://github.com/spring-projects/spring-kafka ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/spring-projects/spring-kafka/releases )
- [Commits](https://github.com/spring-projects/spring-kafka/compare/v3.1.0...v3.1.1 )
---
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>
2023-12-19 10:39:31 -05:00
Artem Bilan
4ca6164a4e
Add merge-dependabot-pr.yml GHA
2023-12-19 10:27:33 -05:00