Skip to content

Commit edbaf6d

Browse files
artembilanartembilan
committed
Start version 6.2.0
* Add Christian Tzolov to author name in the doc * Move `whats-new.adoc` content to new `changes-6.0-6.1.adoc` * Upgrade to Gradle `8.1.1` * Upgrade to Spring Framework `6.1` * Fix `StompSessionManagerTests` for deprecated `ConcurrentTaskScheduler` ctor * Fix XML configs for Kafka to use types for ctor args instead of their names. Apparently SF doesn't do a discovery by names anymore.
1 parent 6433445 commit edbaf6d

File tree

12 files changed

+112
-102
lines changed

12 files changed

+112
-102
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ ext {
108108
springKafkaVersion = '3.0.7'
109109
springRetryVersion = '2.0.1'
110110
springSecurityVersion = '6.1.0'
111-
springVersion = '6.0.9'
111+
springVersion = '6.1.0-SNAPSHOT'
112112
springWsVersion = '4.0.4'
113113
testcontainersVersion = '1.18.1'
114114
tomcatVersion = '10.1.8'

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=6.1.1-SNAPSHOT
1+
version=6.2.0-SNAPSHOT
22
org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
33
kotlin.jvm.target.validation.mode=IGNORE
44
org.gradle.caching=true

‎gradle/wrapper/gradle-wrapper.jar

468 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
55
networkTimeout=10000
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
197194
done
198195
fi
199196

197+
198+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200+
200201
# Collect all arguments for the java command;
201202
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202203
# shell script including quotes and variable substitutions, so put them in

‎spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/AllXmlTests-context.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
1010
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
1111

12-
<context:property-placeholder />
12+
<context:property-placeholder/>
1313

1414
<bean id="cf" class="org.springframework.kafka.core.DefaultKafkaConsumerFactory">
1515
<constructor-arg>
@@ -34,7 +34,7 @@
3434
</bean>
3535

3636
<bean id="cp" class="org.springframework.kafka.listener.ConsumerProperties">
37-
<constructor-arg name="topics" value="one"/>
37+
<constructor-arg type="java.lang.String[]" value="one"/>
3838
<property name="groupId" value="groupForTopic1"/>
3939
</bean>
4040

@@ -58,8 +58,7 @@
5858

5959
<int:chain input-channel="fromTwo" output-channel="lastChannel">
6060
<int:transformer expression="payload + headers['kafka_receivedTopic']"/>
61-
<int-kafka:outbound-gateway
62-
kafka-template="replyingTemplate"/>
61+
<int-kafka:outbound-gateway kafka-template="replyingTemplate"/>
6362
<int:transformer expression="payload + headers['kafka_receivedTopic']"/>
6463
</int:chain>
6564

@@ -72,8 +71,7 @@
7271
kafka-template="replyingTemplate"
7372
request-channel="fromThree"/>
7473

75-
<int:transformer input-channel="fromThree"
76-
expression="payload + headers['kafka_receivedTopic']"/>
74+
<int:transformer input-channel="fromThree" expression="payload + headers['kafka_receivedTopic']"/>
7775

7876
<bean id="template" class="org.springframework.kafka.core.KafkaTemplate">
7977
<constructor-arg ref="pf"/>
@@ -83,7 +81,7 @@
8381
<constructor-arg ref="cf"/>
8482
<constructor-arg>
8583
<bean class="org.springframework.kafka.listener.ContainerProperties">
86-
<constructor-arg name="topics" value="two"/>
84+
<constructor-arg type="java.lang.String[]" value="two"/>
8785
<property name="groupId" value="container1"/>
8886
</bean>
8987
</constructor-arg>
@@ -93,7 +91,7 @@
9391
<constructor-arg ref="cf"/>
9492
<constructor-arg>
9593
<bean class="org.springframework.kafka.listener.ContainerProperties">
96-
<constructor-arg name="topics" value="three"/>
94+
<constructor-arg type="java.lang.String[]" value="three"/>
9795
<property name="groupId" value="container3"/>
9896
</bean>
9997
</constructor-arg>
@@ -109,7 +107,7 @@
109107
<constructor-arg ref="cf"/>
110108
<constructor-arg>
111109
<bean class="org.springframework.kafka.listener.ContainerProperties">
112-
<constructor-arg name="topics" value="four"/>
110+
<constructor-arg type="java.lang.String[]" value="four"/>
113111
<property name="groupId" value="container4"/>
114112
</bean>
115113
</constructor-arg>

‎spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParserTests-context.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
</bean>
4040

4141
<bean id="consumerProperties1" class="org.springframework.kafka.listener.ConsumerProperties">
42-
<constructor-arg name="topics" value="topic1"/>
42+
<constructor-arg value="topic1" type="java.lang.String[]"/>
4343
<property name="groupId" value="group"/>
4444
<property name="clientId" value="client"/>
4545
<property name="consumerRebalanceListener" ref="rebal"/>
4646
</bean>
4747

4848
<bean id="consumerProperties2" class="org.springframework.kafka.listener.ConsumerProperties">
49-
<constructor-arg name="topics" value="topic1, topic2"/>
49+
<constructor-arg value="topic1, topic2" type="java.lang.String[]"/>
5050
<property name="groupId" value="group"/>
5151
</bean>
5252

‎spring-integration-stomp/src/test/java/org/springframework/integration/stomp/StompSessionManagerTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2022 the original author or authors.
2+
* Copyright 2016-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
1717
package org.springframework.integration.stomp;
1818

1919
import java.util.concurrent.CompletableFuture;
20+
import java.util.concurrent.Executors;
2021
import java.util.concurrent.TimeUnit;
2122
import java.util.concurrent.atomic.AtomicBoolean;
2223

@@ -42,7 +43,7 @@ public class StompSessionManagerTests {
4243
@Test
4344
public void testDoConnectFailure() throws Exception {
4445
StompClientSupport stompClient = mock(StompClientSupport.class);
45-
stompClient.setTaskScheduler(new ConcurrentTaskScheduler());
46+
stompClient.setTaskScheduler(new ConcurrentTaskScheduler(Executors.newSingleThreadScheduledExecutor()));
4647
AbstractStompSessionManager sessionManager = new AbstractStompSessionManager(stompClient) {
4748

4849
private final AtomicBoolean thrown = new AtomicBoolean();

‎src/reference/asciidoc/changes-6.0-6.1.adoc

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
[[migration-6.0-6.1]]
2+
=== Changes between 6.0 and 6.1
3+
4+
[[x6.1-new-components]]
5+
=== New Components
6+
7+
[[x6.1-zip]]
8+
==== Zip Support
9+
10+
The Zip Spring Integration Extension project has been migrated as the `spring-integration-zip` module.
11+
See <<./zip.adoc#zip,Zip Support>> for more information.
12+
13+
[[x6.1-context-holder-advice]]
14+
==== `ContextHolderRequestHandlerAdvice`
15+
16+
The `ContextHolderRequestHandlerAdvice` allows to store a value from a request message into some context around `MessageHandler` execution.
17+
See <<./handler-advice.adoc#context-holder-advice, Context Holder Advice>> for more information.
18+
19+
[[x6.1-handle-reactive]]
20+
==== The `handleReactive()` operator for Java DSL
21+
The `IntegrationFlow` can now end with a convenient `handleReactive(ReactiveMessageHandler)` operator.
22+
See <<./reactive-streams.adoc#reactive-message-handler, `ReactiveMessageHandler`>> for more information.
23+
24+
[[x6.1-partitioned-channel]]
25+
==== `PartitionedChannel`
26+
A new `PartitionedChannel` has been introduced to process messages with the same partition key in the same thread.
27+
See <<./channel.adoc#partitioned-channel, `PartitionedChannel`>> for more information.
28+
29+
[[x6.1-general]]
30+
=== General Changes
31+
32+
- Added support for transforming to/from Protocol Buffers.
33+
See <<./transformer.adoc#Protobuf-transformers, Protocol Buffers Transformers>> for more information.
34+
35+
- The `MessageFilter` now emits a warning into logs when message is silently discarded and dropped.
36+
See <<./filter.adoc#filter, Filter>> for more information.
37+
38+
- The default timeout for send and receive operations in gateways and replying channel adapters has been changed from infinity to `30` seconds.
39+
Only one left as a `1` second is a `receiveTimeout` for `PollingConsumer` to not block a scheduler thread too long and let other queued tasks to be performed with the `TaskScheduler`.
40+
41+
- The `IntegrationComponentSpec.get()` method has been deprecated with removal planned for the next version.
42+
Since `IntegrationComponentSpec` is a `FactoryBean`, its bean definition must stay as is without any target object resolutions.
43+
The Java DSL and the framework by itself will manage the `IntegrationComponentSpec` lifecycle.
44+
See <<./dsl.adoc#java-dsl, Java DSL>> for more information.
45+
46+
- The `AbstractMessageProducingHandler` is marked as an `async` by default if its output channel is configured to a `ReactiveStreamsSubscribableChannel`.
47+
See <<./service-activator.adoc#async-service-activator,Asynchronous Service Activator>> for more information.
48+
49+
[[x6.1-web-sockets]]
50+
=== Web Sockets Changes
51+
52+
A `ClientWebSocketContainer` can now be configured with a predefined `URI` instead of a combination of `uriTemplate` and `uriVariables`.
53+
See <<./web-sockets.adoc#web-socket-overview, WebSocket Overview>> for more information.
54+
55+
[[x6.1-jms]]
56+
=== JMS Changes
57+
58+
The `JmsInboundGateway`, via its `ChannelPublishingJmsMessageListener`, can now be configured with a `replyToExpression` to resolve a reply destination against the request message at runtime.
59+
See <<./jms.adoc#jms-inbound-gateway, JMS Inbound Gateway>> for more information.
60+
61+
[[x6.1-mail]]
62+
=== Mail Changes
63+
64+
The (previously deprecated) `ImapIdleChannelAdapter.sendingTaskExecutor` property has been removed in favor of an asynchronous message process downstream in the flow.
65+
See <<./mail.adoc#mail-inbound, Mail-receiving Channel Adapter>> for more information.
66+
67+
[[x6.1-file]]
68+
=== Files Changes
69+
70+
The `FileReadingMessageSource` now exposes `watchMaxDepth` and `watchDirPredicate` options for the `WatchService`.
71+
See <<./file.adoc#watch-service-directory-scanner, `WatchServiceDirectoryScanner`>> for more information.
72+
73+
[[x6.1-amqp]]
74+
=== AMQP Changes
75+
76+
The Java DSL API for Rabbit Streams (the `RabbitStream` factory) exposes additional properties for simple configurations.
77+
See <<./amqp.adoc#rmq-streams, `RabbitMQ Stream Queue Support`>> for more information.
78+
79+
80+
[[x6.1-jdbc]]
81+
=== JDBC Changes
82+
83+
The `DefaultLockRepository` now exposes setters for `insert`, `update` and `renew` queries.
84+
See <<./jdbc.adoc#jdbc-lock-registry, JDBC Lock Registry>> for more information.

‎src/reference/asciidoc/history.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
== Change History
33

44
// BE SURE TO PRECEDE ALL include:: with a blank line - see https://github.com/asciidoctor/asciidoctor/issues/1297
5+
include::./changes-6.0-6.1.adoc[]
6+
57
include::./changes-5.5-6.0.adoc[]
68

79
include::./changes-5.4-5.5.adoc[]

‎src/reference/asciidoc/index-header.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[spring-integration-reference]]
22
= Spring Integration Reference Guide
3-
Mark Fisher; Marius Bogoevici; Iwein Fuld; Jonas Partner; Oleg Zhurakousky; Gary Russell; Dave Syer; Josh Long; David Turanski; Gunnar Hillert; Artem Bilan; Amol Nayak; Jay Bryant
3+
Mark Fisher; Marius Bogoevici; Iwein Fuld; Jonas Partner; Oleg Zhurakousky; Gary Russell; Dave Syer; Josh Long; David Turanski; Gunnar Hillert; Artem Bilan; Amol Nayak; Jay Bryant; Christian Tzolov
44

55
(C) 2009 - 2023 VMware, Inc.
66
All rights reserved.

‎src/reference/asciidoc/whats-new.adoc

Lines changed: 5 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -2,96 +2,20 @@
22
= What's New?
33

44
[[spring-integration-intro-new]]
5-
For those who are already familiar with Spring Integration, this chapter provides a brief overview of the new features of version 6.1.
5+
For those who are already familiar with Spring Integration, this chapter provides a brief overview of the new features of version 6.2.
66

77
If you are interested in the changes and features that were introduced in earlier versions, see the <<./history.adoc#history,Change History>>.
88

99
[[whats-new]]
1010

11-
== What's New in Spring Integration 6.1?
11+
== What's New in Spring Integration 6.2?
1212

13-
If you are interested in more details, see the Issue Tracker tickets that were resolved as part of the 6.1 development process.
13+
If you are interested in more details, see the Issue Tracker tickets that were resolved as part of the 6.2 development process.
1414

1515
In general the project has been moved to the latest dependency versions.
1616

17-
[[x6.1-new-components]]
17+
[[x6.2-new-components]]
1818
=== New Components
1919

20-
[[x6.1-zip]]
21-
==== Zip Support
22-
23-
The Zip Spring Integration Extension project has been migrated as the `spring-integration-zip` module.
24-
See <<./zip.adoc#zip,Zip Support>> for more information.
25-
26-
[[x6.1-context-holder-advice]]
27-
==== `ContextHolderRequestHandlerAdvice`
28-
29-
The `ContextHolderRequestHandlerAdvice` allows to store a value from a request message into some context around `MessageHandler` execution.
30-
See <<./handler-advice.adoc#context-holder-advice, Context Holder Advice>> for more information.
31-
32-
[[x6.1-handle-reactive]]
33-
==== The `handleReactive()` operator for Java DSL
34-
The `IntegrationFlow` can now end with a convenient `handleReactive(ReactiveMessageHandler)` operator.
35-
See <<./reactive-streams.adoc#reactive-message-handler, `ReactiveMessageHandler`>> for more information.
36-
37-
[[x6.1-partitioned-channel]]
38-
==== `PartitionedChannel`
39-
A new `PartitionedChannel` has been introduced to process messages with the same partition key in the same thread.
40-
See <<./channel.adoc#partitioned-channel, `PartitionedChannel`>> for more information.
41-
42-
[[x6.1-general]]
20+
[[x6.2-general]]
4321
=== General Changes
44-
45-
- Added support for transforming to/from Protocol Buffers.
46-
See <<./transformer.adoc#Protobuf-transformers, Protocol Buffers Transformers>> for more information.
47-
48-
- The `MessageFilter` now emits a warning into logs when message is silently discarded and dropped.
49-
See <<./filter.adoc#filter, Filter>> for more information.
50-
51-
- The default timeout for send and receive operations in gateways and replying channel adapters has been changed from infinity to `30` seconds.
52-
Only one left as a `1` second is a `receiveTimeout` for `PollingConsumer` to not block a scheduler thread too long and let other queued tasks to be performed with the `TaskScheduler`.
53-
54-
- The `IntegrationComponentSpec.get()` method has been deprecated with removal planned for the next version.
55-
Since `IntegrationComponentSpec` is a `FactoryBean`, its bean definition must stay as is without any target object resolutions.
56-
The Java DSL and the framework by itself will manage the `IntegrationComponentSpec` lifecycle.
57-
See <<./dsl.adoc#java-dsl, Java DSL>> for more information.
58-
59-
- The `AbstractMessageProducingHandler` is marked as an `async` by default if its output channel is configured to a `ReactiveStreamsSubscribableChannel`.
60-
See <<./service-activator.adoc#async-service-activator,Asynchronous Service Activator>> for more information.
61-
62-
[[x6.1-web-sockets]]
63-
=== Web Sockets Changes
64-
65-
A `ClientWebSocketContainer` can now be configured with a predefined `URI` instead of a combination of `uriTemplate` and `uriVariables`.
66-
See <<./web-sockets.adoc#web-socket-overview, WebSocket Overview>> for more information.
67-
68-
[[x6.1-jms]]
69-
=== JMS Changes
70-
71-
The `JmsInboundGateway`, via its `ChannelPublishingJmsMessageListener`, can now be configured with a `replyToExpression` to resolve a reply destination against the request message at runtime.
72-
See <<./jms.adoc#jms-inbound-gateway, JMS Inbound Gateway>> for more information.
73-
74-
[[x6.1-mail]]
75-
=== Mail Changes
76-
77-
The (previously deprecated) `ImapIdleChannelAdapter.sendingTaskExecutor` property has been removed in favor of an asynchronous message process downstream in the flow.
78-
See <<./mail.adoc#mail-inbound, Mail-receiving Channel Adapter>> for more information.
79-
80-
[[x6.1-file]]
81-
=== Files Changes
82-
83-
The `FileReadingMessageSource` now exposes `watchMaxDepth` and `watchDirPredicate` options for the `WatchService`.
84-
See <<./file.adoc#watch-service-directory-scanner, `WatchServiceDirectoryScanner`>> for more information.
85-
86-
[[x6.1-amqp]]
87-
=== AMQP Changes
88-
89-
The Java DSL API for Rabbit Streams (the `RabbitStream` factory) exposes additional properties for simple configurations.
90-
See <<./amqp.adoc#rmq-streams, `RabbitMQ Stream Queue Support`>> for more information.
91-
92-
93-
[[x6.1-jdbc]]
94-
=== JDBC Changes
95-
96-
The `DefaultLockRepository` now exposes setters for `insert`, `update` and `renew` queries.
97-
See <<./jdbc.adoc#jdbc-lock-registry, JDBC Lock Registry>> for more information.

0 commit comments

Comments
 (0)