Upgrade to SI-5.3.0.M4

advanced/advanced-testing-examples/pom.xml

@@ -188,7 +188,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

advanced/dynamic-ftp/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

advanced/dynamic-tcp-client/pom.xml

@@ -195,7 +195,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/cafe-scripted/pom.xml

@@ -234,7 +234,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/cafe/cafe-amqp/pom.xml

@@ -177,7 +177,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/cafe/cafe-jms/pom.xml

@@ -217,7 +217,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/cafe/cafe-si/pom.xml

@@ -176,7 +176,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/file-split-ftp/pom.xml

@@ -263,7 +263,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/loan-broker/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/loanshark/pom.xml

@@ -458,7 +458,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

applications/stomp-chat/pom.xml

@@ -217,7 +217,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/amqp/pom.xml

@@ -188,7 +188,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/barrier/pom.xml

@@ -228,7 +228,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/control-bus/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/enricher/pom.xml

@@ -177,7 +177,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/feed/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/file/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/ftp/pom.xml

@@ -224,7 +224,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/helloworld/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/http/pom.xml

@@ -235,7 +235,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jdbc/pom.xml

@@ -177,7 +177,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jms/pom.xml

@@ -227,7 +227,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jmx/pom.xml

@@ -176,7 +176,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jpa/pom.xml

@@ -230,7 +230,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/kafka/pom.xml

@@ -235,7 +235,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/mail/pom.xml

@@ -200,7 +200,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/mongodb/pom.xml

@@ -177,7 +177,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/mqtt/pom.xml

@@ -217,7 +217,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/oddeven/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/quote/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/sftp/pom.xml

@@ -177,7 +177,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/splunk/pom.xml

@@ -207,7 +207,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-amqp/pom.xml

@@ -200,7 +200,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-broadcast/pom.xml

@@ -206,7 +206,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-client-server/pom.xml

@@ -188,7 +188,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-with-headers/pom.xml

@@ -206,7 +206,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/testing-examples/pom.xml

@@ -209,7 +209,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/twitter/pom.xml

@@ -166,7 +166,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/web-sockets/pom.xml

@@ -195,7 +195,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/ws-inbound-gateway/pom.xml

@@ -187,7 +187,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/ws-outbound-gateway/pom.xml

@@ -176,7 +176,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/xml/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/xmpp/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

build.gradle

@@ -161,7 +161,7 @@ subprojects { subproject ->
 		apply plugin: 'io.spring.dependency-management'
 
 		jacoco {
-			toolVersion = "0.7.9"
+			toolVersion = "0.8.5"
 		}
 
 		compileJava {
@@ -211,7 +211,7 @@ subprojects { subproject ->
 			subethasmtpVersion = '1.2'
 			slf4jVersion = '1.7.25'
 			springCloudVersion ='Hoxton.SR3'
-			springIntegrationVersion = '5.3.0.M3'
+			springIntegrationVersion = '5.3.0.M4'
 			springIntegrationKafkaVersion = '3.2.1.RELEASE'
 			springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
 			springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'

dsl/cafe-dsl/pom.xml

@@ -207,7 +207,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

dsl/kafka-dsl/pom.xml

@@ -219,7 +219,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

dsl/pom.xml

@@ -140,7 +140,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

dsl/si4demo/pom.xml

@@ -276,7 +276,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

intermediate/async-gateway/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/dynamic-poller/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/errorhandling/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/file-processing/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/mail-attachments/pom.xml

@@ -235,7 +235,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/monitoring/pom.xml

@@ -211,7 +211,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/multipart-http/pom.xml

@@ -211,7 +211,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/rest-http/pom.xml

@@ -266,7 +266,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/retry-and-more/pom.xml

@@ -198,7 +198,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/splitter-aggregator-reaper/pom.xml

@@ -177,7 +177,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/stored-procedures-derby/pom.xml

@@ -177,7 +177,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/stored-procedures-ms/pom.xml

@@ -189,7 +189,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/stored-procedures-oracle/pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/stored-procedures-postgresql/pom.xml

@@ -201,7 +201,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/tcp-client-server-multiplex/pom.xml

@@ -176,7 +176,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/testcontainers-rabbitmq/pom.xml

@@ -274,7 +274,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/travel/pom.xml

@@ -187,7 +187,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

intermediate/tx-synch/pom.xml

@@ -188,7 +188,7 @@
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.3.0.M3</version>
+        <version>5.3.0.M4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>