diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index b25ccbe6..84284e4b 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 5.3.0.RELEASE + 5.4.0 Advanced Testing Examples Advanced Testing Examples https://projects.spring.io/spring-integration @@ -146,8 +146,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 148e6ef7..8f9bdf91 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 5.3.0.RELEASE + 5.4.0 Dynamic FTP Demo Dynamic FTP Demo https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index efbc9a84..f9013df8 100644 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.ftp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.File; diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 1508d255..47341e7a 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client - 5.3.0.RELEASE + 5.4.0 Dynamic TCP Client Dynamic TCP Client https://projects.spring.io/spring-integration @@ -127,8 +127,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -174,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/advanced/pom.xml b/advanced/pom.xml index 8eee9d06..58310766 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index b3d244af..158a0d5b 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 5.3.0.RELEASE + 5.4.0 Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) https://projects.spring.io/spring-integration @@ -101,8 +101,8 @@ org.jruby - jruby - 1.7.12 + jruby-complete + 9.2.11.1 compile @@ -192,8 +192,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -227,14 +227,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index fd8a8ebd..0bad1250 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -30,6 +30,7 @@ import org.springframework.scripting.support.ResourceScriptSource; * */ public class ScriptTests { + @Test public void testRuby() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("ruby"); diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 9afafa34..f83ba3fa 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 5.3.0.RELEASE + 5.4.0 Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker https://projects.spring.io/spring-integration @@ -58,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 compile @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 353faf60..e209452d 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 5.3.0.RELEASE + 5.4.0 Cafe - With JMS Message Broker Cafe - With JMS Message Broker https://projects.spring.io/spring-integration @@ -58,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 compile @@ -175,8 +175,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 3f227185..cf2766e7 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 Cafe - Pure Spring Integration Cafe - Pure Spring Integration https://projects.spring.io/spring-integration @@ -134,8 +134,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 621052fc..431148b0 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 4b00e0b9..af031950 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples file-split-ftp - 5.3.0.RELEASE + 5.4.0 File Split FTP File Split FTP https://projects.spring.io/spring-integration @@ -184,8 +184,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -205,17 +205,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -242,7 +231,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -256,14 +245,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 64e7a378..272a078d 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 5.3.0.RELEASE + 5.4.0 Loan Broker Sample Loan Broker Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 85a7d9e4..93a9aff6 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 5.3.0.RELEASE + 5.4.0 Loan Shark Sample Loan Shark Sample https://projects.spring.io/spring-integration @@ -416,8 +416,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -451,14 +451,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/pom.xml b/applications/pom.xml index dd331756..587f54aa 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c4cab173..60ff5408 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples stomp-chat - 5.3.0.RELEASE + 5.4.0 Web Sockets Stomp Chat Sample Web Sockets Stomp Chat Sample https://projects.spring.io/spring-integration @@ -149,8 +149,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -196,7 +196,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 6e1d45d7..f6a8679d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 5.3.0.RELEASE + 5.4.0 AMQP Basic Sample AMQP Basic Sample https://projects.spring.io/spring-integration @@ -146,8 +146,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 2b90e30d..64d697fc 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples barrier - 5.3.0.RELEASE + 5.4.0 Barrier Sample Barrier Sample https://projects.spring.io/spring-integration @@ -160,8 +160,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -207,7 +207,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -221,14 +221,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index ce935e6c..84d8b76d 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 5.3.0.RELEASE + 5.4.0 Control Bus Basic Sample Control Bus Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index c159f8e1..d9506df4 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 5.3.0.RELEASE + 5.4.0 Enricher Basic Sample Enricher Basic Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 6c2202bd..3b8a05c8 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 5.3.0.RELEASE + 5.4.0 Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index cd45801a..6fb657ff 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 5.3.0.RELEASE + 5.4.0 File Copy Basic Sample File Copy Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 62048657..a4298a3f 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 5.3.0.RELEASE + 5.4.0 FTP Basic Sample FTP Basic Sample https://projects.spring.io/spring-integration @@ -159,8 +159,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,17 +181,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -217,14 +206,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 9874fdb7..6ab34871 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 5.3.0.RELEASE + 5.4.0 Hello World Sample Hello World Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index e69a35df..3e0b4da4 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 5.3.0.RELEASE + 5.4.0 HTTP Sample HTTP Sample https://projects.spring.io/spring-integration @@ -193,8 +193,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -228,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index a725a2f6..fb9c1288 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 5.3.0.RELEASE + 5.4.0 JDBC Basic Sample JDBC Basic Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 22b4a4ab..aa3372ee 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 5.3.0.RELEASE + 5.4.0 JMS Basic Sample JMS Basic Sample https://projects.spring.io/spring-integration @@ -173,17 +173,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -220,14 +209,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index e743ae7d..84043295 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 5.3.0.RELEASE + 5.4.0 JMX Basic Sample JMX Basic Sample https://projects.spring.io/spring-integration @@ -134,8 +134,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index adfaefe8..38d16387 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples jpa - 5.3.0.RELEASE + 5.4.0 JPA Basic Sample JPA Basic Sample https://projects.spring.io/spring-integration @@ -162,8 +162,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -209,7 +209,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ca0d14b0..2d1e7a06 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples kafka - 5.3.0.RELEASE + 5.4.0 Apache Kafka Sample Apache Kafka Sample https://projects.spring.io/spring-integration @@ -74,7 +74,6 @@ org.springframework.integration spring-integration-kafka - 3.3.0.RELEASE compile @@ -98,18 +97,6 @@ - - org.springframework.kafka - spring-kafka - 2.5.2.RELEASE - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.apache.logging.log4j log4j-core @@ -167,8 +154,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -214,7 +201,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -228,14 +215,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index ad615588..1b96d880 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 5.3.0.RELEASE + 5.4.0 Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample https://projects.spring.io/spring-integration @@ -158,8 +158,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -193,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 3c807b0c..5de5c9ee 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 5.3.0.RELEASE + 5.4.0 MongoDb Basic Sample MongoDb Basic Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 7d224fa2..95d772ef 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples mqtt - 5.3.0.RELEASE + 5.4.0 MQTT Basic Sample MQTT Basic Sample https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -159,17 +159,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -196,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -210,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0557e1be..163e41b5 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 5.3.0.RELEASE + 5.4.0 Odd-Even Sample Odd-Even Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/pom.xml b/basic/pom.xml index 191fff61..1307233c 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index cf8c5470..af228ef3 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 5.3.0.RELEASE + 5.4.0 Quote Sample Quote Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index cbbc26af..2c02db92 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 5.3.0.RELEASE + 5.4.0 SFTP Basic Sample SFTP Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java index b91359e8..bbaef959 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java @@ -16,8 +16,8 @@ package org.springframework.integration.samples.sftp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 88872a58..b1740426 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples splunk - 5.3.0.RELEASE + 5.4.0 Splunk Sample Splunk Sample https://projects.spring.io/spring-integration @@ -139,8 +139,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -186,7 +186,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7f00419e..f3fdf8b9 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 5.3.0.RELEASE + 5.4.0 TCP-AMQP Basic Sample TCP-AMQP Basic Sample https://projects.spring.io/spring-integration @@ -158,8 +158,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -193,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 45b3ad4f..da1744ed 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples tcp-broadcast - 5.3.0.RELEASE + 5.4.0 TCP Client Broadcast Sample TCP Client Broadcast Sample https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -185,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 05c04ecc..dd773944 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 5.3.0.RELEASE + 5.4.0 TCP Client Server Sample TCP Client Server Sample https://projects.spring.io/spring-integration @@ -145,17 +145,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -181,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index f3e59210..0ea00637 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples tcp-with-headers - 5.3.0.RELEASE + 5.4.0 TCP Send/Receive with headers TCP Send/Receive with headers https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -185,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 047ecd82..796b6ff6 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 5.3.0.RELEASE + 5.4.0 Testing Examples Testing Examples https://projects.spring.io/spring-integration @@ -155,17 +155,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -202,14 +191,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java index b06389aa..c30e0886 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java @@ -15,10 +15,10 @@ */ package org.springframework.integration.samples.testing.aggregator; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; import java.util.List; @@ -36,15 +36,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * + * * Shows how to test a custom aggregator. Unit test for the class and * tests for the integration subflow. * The subflow has direct input and output channels. The flow would * be a fragment of a larger flow. Since the output channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 * @@ -52,10 +52,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class CommaDelimitedAggregatorTests { - + @Autowired MessageChannel inputChannel; - + @Autowired QueueChannel testChannel; @@ -65,7 +65,7 @@ public class CommaDelimitedAggregatorTests { String out = new CommaDelimitedAggregator().aggregate(splits); assertEquals("a,b,c", out); } - + @Test public void unitTestClass2() { List splits = new CommaDelimitedSplitter().split(" a ,, c "); diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java index 5e643e57..cfc4132d 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java @@ -15,10 +15,10 @@ */ package org.springframework.integration.samples.testing.filter; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; @@ -34,30 +34,30 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * - * Shows how to test a filter. + * + * Shows how to test a filter. * The filter has direct input and output channels. The filter configuration would * be a fragment of a larger flow. Since the output channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * Similarly, we bridge the discard channel which is configured on the second * filter instance. - * + * * @author Gary Russell * @since 2.0.2 */ @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class PetFilterTests { - + @Autowired MessageChannel inputChannel; - + @Autowired MessageChannel inputChannel2; - + @Autowired QueueChannel testChannel; @@ -72,19 +72,19 @@ public class PetFilterTests { String payload = "CAT:Fluffy"; assertFalse(new PetFilter().dogsOnly(payload)); } - + @Test public void unitTestClassDog() { String payload = "DOG:Fido"; assertTrue(new PetFilter().dogsOnly(payload)); } - + @Test public void unitTestClassLizard() { String payload = "LIZARD:Scaly"; assertFalse(new PetFilter().dogsOnly(payload)); } - + @Test public void testCat() { String payload = "CAT:Fluffy"; @@ -112,7 +112,7 @@ public class PetFilterTests { Message outMessage = testChannel.receive(0); assertNull("Expected no output message", outMessage); } - + @Test public void testCatDiscard() { String payload = "CAT:Fluffy"; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java index 5e83b3ac..b7ae14de 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java @@ -15,8 +15,8 @@ */ package org.springframework.integration.samples.testing.gateway; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; @@ -31,15 +31,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * + * * Shows how to test a gateway to ensure the message injected * into the Spring Integration flow is what we expected. * The gateway uses a direct input channel. The configuration would * be a fragment of a larger flow. Since the input channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 * @@ -47,13 +47,13 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class GatewayTests { - + @Autowired QueueChannel testChannel; - + @Autowired VoidGateway gateway; - + @Test public void testTrueHeader() { String payload = "XXXABCXXX"; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java index 002065e7..26440ab2 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.testing.router; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; import org.junit.Test; @@ -32,51 +32,51 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * + * * Shows how to test a router; the router is configured to route to direct * channel names. The configuration would * be a fragment of a larger flow. Since the output channels are direct, - * they have no subscribers outside the context of a larger flow. So, + * they have no subscribers outside the context of a larger flow. So, * in this test case, we bridge them to {@link QueueChannel}s to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 */ @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class PetRouterTests { - + @Autowired MessageChannel inputChannel; - + @Autowired QueueChannel testFelineChannel; - + @Autowired QueueChannel testCanineChannel; - + @Autowired QueueChannel testUnknownPetTypeChannel; - + @Test public void unitTestClassCat() { String payload = "CAT:Fluffy"; assertEquals("felineChannel", new PetRouter().route(payload)); } - + @Test public void unitTestClassDog() { String payload = "DOG:Fido"; assertEquals("canineChannel", new PetRouter().route(payload)); } - + @Test public void unitTestClassLizard() { String payload = "LIZARD:Scaly"; assertEquals("unknownPetTypeChannel", new PetRouter().route(payload)); } - + @Test public void testCat() { String payload = "CAT:Fluffy"; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java index 4484d7dc..e51dec19 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java @@ -15,10 +15,10 @@ */ package org.springframework.integration.samples.testing.splitter; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; import java.util.List; @@ -35,15 +35,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * + * * Shows how to test a custom splitter. Unit test for the class and * tests for the integration subflow. * The splitter has direct input and output channels. The splitter would * be a fragment of a larger flow. Since the output channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 * @@ -51,10 +51,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class CommaDelimitedSplitterTests { - + @Autowired MessageChannel inputChannel; - + @Autowired QueueChannel testChannel; @@ -66,7 +66,7 @@ public class CommaDelimitedSplitterTests { assertEquals("b", splits.get(1)); assertEquals("c", splits.get(2)); } - + @Test public void unitTestClass2() { List splits = new CommaDelimitedSplitter().split(" a ,, c "); diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 0ed9b41b..478e081f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 5.3.0.RELEASE + 5.4.0 Twitter Basic Sample Twitter Basic Sample https://projects.spring.io/spring-integration @@ -124,8 +124,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 1d88a3ac..4cc7557c 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples web-sockets - 5.3.0.RELEASE + 5.4.0 Web Sockets Basic Sample Web Sockets Basic Sample https://projects.spring.io/spring-integration @@ -127,8 +127,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -174,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java index 664460b1..5696ac79 100644 --- a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -16,9 +16,9 @@ package org.springframework.integration.samples.websocket.standard; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 6a72d12b..e0e70538 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 5.3.0.RELEASE + 5.4.0 WS Inbound Gateway Sample WS Inbound Gateway Sample https://projects.spring.io/spring-integration @@ -145,8 +145,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java index a92dbadd..7590b1e5 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java @@ -17,7 +17,7 @@ package org.springframework.integration.samples.ws; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import javax.xml.transform.Source; diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java index 4da1babc..5126fef0 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java @@ -19,7 +19,7 @@ package org.springframework.integration.samples.ws; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.io.StringReader; diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index e7f8cc94..6d59e54f 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 5.3.0.RELEASE + 5.4.0 WS Outbound Gateway Sample WS Outbound Gateway Sample https://projects.spring.io/spring-integration @@ -134,8 +134,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 853f9488..845baa45 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 5.3.0.RELEASE + 5.4.0 XML Sample XML Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 6d3f2646..dcc2946f 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 5.3.0.RELEASE + 5.4.0 XMPP Basic Sample XMPP Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/build.gradle b/build.gradle index 2e32cd27..a1fe6391 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { repositories { maven { url 'https://repo.spring.io/libs-snapshot' } maven { url 'https://repo.spring.io/libs-milestone' } -// maven { url 'https://repo.spring.io/libs-staging-local' } + maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -196,7 +196,7 @@ subprojects { subproject -> jtaVersion = '1.1' jtdsVersion = '1.2.6' jmsApiVersion = '2.0.1' - jrubyVersion = '1.7.12' + jrubyVersion = '9.2.11.1' jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.0.0' jstlVersion = '1.2' @@ -210,14 +210,12 @@ subprojects { subproject -> postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.1.RELEASE' - springIntegrationKafkaVersion = '3.3.0.RELEASE' + springCloudVersion ='2020.0.0-M2' + springIntegrationVersion = '5.4.0-M1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.5.2.RELEASE' - springVersion = '5.2.7.RELEASE' - springSecurityVersion = '5.3.3.RELEASE' + springVersion = '5.3.0-M1' + springSecurityVersion = '5.4.0-M1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' @@ -245,7 +243,7 @@ subprojects { subproject -> testCompile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - testCompile "org.springframework:spring-test" + testCompile "org.springframework.integration:spring-integration-test" } configurations { @@ -349,7 +347,7 @@ project('cafe-scripted') { compile "org.springframework.integration:spring-integration-groovy" compile "org.springframework.integration:spring-integration-rmi" compile "org.springframework.integration:spring-integration-jmx" - compile "org.jruby:jruby:$jrubyVersion" + compile "org.jruby:jruby-complete:$jrubyVersion" compile "org.python:jython-standalone:$jythonVersion" compile "org.codehaus.groovy:groovy-all:$groovyVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -614,11 +612,10 @@ project('kafka') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { + compile ('org.springframework.integration:spring-integration-kafka') { exclude group: 'org.slf4j' } compile "org.springframework.integration:spring-integration-core" - compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1422,7 +1419,7 @@ project('kafka-dsl') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' compile "org.springframework.integration:spring-integration-core" - compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") + compile ('org.springframework.integration:spring-integration-kafka') compile "org.apache.logging.log4j:log4j-core:$log4jVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index f29cd761..2cc97725 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples cafe-dsl - 5.3.0.RELEASE + 5.4.0 Java DSL Cafe Sample Java DSL Cafe Sample https://projects.spring.io/spring-integration @@ -63,7 +63,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 compile @@ -139,8 +139,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -186,7 +186,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index d91ff905..a89a2396 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples kafka-dsl - 5.3.0.RELEASE + 5.4.0 Java DSL Kafka Sample Java DSL Kafka Sample https://projects.spring.io/spring-integration @@ -85,7 +85,6 @@ org.springframework.integration spring-integration-kafka - 3.3.0.RELEASE compile @@ -151,8 +150,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -198,7 +197,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -212,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 98f31e07..30f6d3af 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dsl - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO @@ -98,8 +98,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -133,14 +133,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index bf32a5b9..eabd1aa3 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples si4demo - 5.3.0.RELEASE + 5.4.0 Java Configuration/DSL Sample Java Configuration/DSL Sample https://projects.spring.io/spring-integration @@ -208,8 +208,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -255,7 +255,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -269,14 +269,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/gradle.properties b/gradle.properties index a83a765d..3d4de897 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=5.3.0.RELEASE -springBootVersion=2.3.1.RELEASE +version=5.4.0 +springBootVersion=2.4.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536m diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 8b980e34..2dca63a4 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 5.3.0.RELEASE + 5.4.0 Async Gateway Sample Async Gateway Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java similarity index 93% rename from intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java rename to intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java index 769aa5ad..e6d5b989 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.samples.async.gateway; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.util.Random; @@ -53,12 +53,12 @@ import reactor.core.scheduler.Schedulers; * @author Gary Russell * */ -@ContextConfiguration(classes = MonoTest.TestConfig.class) +@ContextConfiguration(classes = MonoGatewayTests.TestConfig.class) @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext -public class MonoTest { +public class MonoGatewayTests { - private static Log logger = LogFactory.getLog(MonoTest.class); + private static Log logger = LogFactory.getLog(MonoGatewayTests.class); @Autowired private MathGateway gateway; @@ -79,7 +79,7 @@ public class MonoTest { for (int i = 0; i < 100; i++) { final int number = numbers[i]; gateway.multiplyByTwo(number) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) .filter(p -> p != null) .doOnNext(result1 -> { logger.info("Result of multiplication of " + number + " by 2 is " + result1); diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 14b606fd..5c2968e8 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 5.3.0.RELEASE + 5.4.0 Dynamic Poller Sample Dynamic Poller Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 9b50ca9e..defcf542 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 5.3.0.RELEASE + 5.4.0 Error Handling Sample Error Handling Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index ad6588e0..360ba048 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 5.3.0.RELEASE + 5.4.0 File Processing Sample File Processing Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index d1ef7b68..3916cc63 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 5.3.0.RELEASE + 5.4.0 Mail Attachment Sample Mail Attachment Sample https://projects.spring.io/spring-integration @@ -169,17 +169,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -228,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 82a07b9a..0d13e4b1 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 5.3.0.RELEASE + 5.4.0 Monitoring Application Monitoring Application https://projects.spring.io/spring-integration @@ -169,8 +169,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 6d7f3ee3..2a204d46 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 5.3.0.RELEASE + 5.4.0 HTTP Multipart Demo HTTP Multipart Demo https://projects.spring.io/spring-integration @@ -169,8 +169,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 602e8d34..637e12ac 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 833dddce..b76cd89f 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 5.3.0.RELEASE + 5.4.0 Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo https://projects.spring.io/spring-integration @@ -146,7 +146,7 @@ org.springframework.security spring-security-web - 5.3.3.RELEASE + 5.4.0-M1 compile @@ -158,7 +158,7 @@ org.springframework.security spring-security-config - 5.3.3.RELEASE + 5.4.0-M1 compile @@ -224,8 +224,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 5220ccdc..134b61dc 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 5.3.0.RELEASE + 5.4.0 Retry and More Sample Retry and More Sample https://projects.spring.io/spring-integration @@ -156,8 +156,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -191,14 +191,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index e48ff6d3..a8c0513c 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 5.3.0.RELEASE + 5.4.0 Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index fcf68961..143cd085 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 5.3.0.RELEASE + 5.4.0 Derby Stored Procedures Sample Derby Stored Procedures Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index f5bb7a4b..f8123c96 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 5.3.0.RELEASE + 5.4.0 MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample https://projects.spring.io/spring-integration @@ -147,8 +147,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -182,14 +182,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index b9ebd6ee..56d5bf96 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 5.3.0.RELEASE + 5.4.0 Oracle Stored Procedures Sample Oracle Stored Procedures Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 758dd067..b071457e 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 5.3.0.RELEASE + 5.4.0 PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample https://projects.spring.io/spring-integration @@ -159,8 +159,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index ec8a3531..7e5fa5f2 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples tcp-async-bi-directional - 5.3.0.RELEASE + 5.4.0 Bi-Directional TCP Sample Bi-Directional TCP Sample https://projects.spring.io/spring-integration @@ -127,8 +127,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -148,17 +148,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -185,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -199,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java index 44cfbe71..4674a7f1 100644 --- a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java +++ b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java @@ -66,7 +66,7 @@ class ClientPeer { @Bean public IntegrationFlow client1Out(AbstractClientConnectionFactory client1) { - return IntegrationFlows.from(() -> "Hello from client1", e -> e.id("client1Adapter") + return IntegrationFlows.fromSupplier(() -> "Hello from client1", e -> e.id("client1Adapter") .poller(Pollers.fixedDelay(3000))) .handle(Tcp.outboundAdapter(client1)) .get(); @@ -87,7 +87,7 @@ class ClientPeer { @Bean public IntegrationFlow client2Out(AbstractClientConnectionFactory client2) { - return IntegrationFlows.from(() -> "Hello from client2", e -> e.id("client2Adapter") + return IntegrationFlows.fromSupplier(() -> "Hello from client2", e -> e.id("client2Adapter") .poller(Pollers.fixedDelay(2000))) .handle(Tcp.outboundAdapter(client2)) .get(); @@ -123,7 +123,7 @@ class ServerPeer { @Bean public IntegrationFlow serverOut(AbstractServerConnectionFactory server) { - return IntegrationFlows.from(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) + return IntegrationFlows.fromSupplier(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) .split(this.clients, "iterator") .enrichHeaders(h -> h.headerExpression(IpHeaders.CONNECTION_ID, "payload")) .transform(p -> "Hello from server") diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 384780e5..67223045 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 5.3.0.RELEASE + 5.4.0 TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample https://projects.spring.io/spring-integration @@ -122,17 +122,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -169,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index 1fee4761..503fab31 100644 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -16,9 +16,9 @@ package org.springframework.integration.samples.tcpclientserver; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 784344df..afad6802 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples testcontainers-rabbitmq - 5.3.0.RELEASE + 5.4.0 Testcontainers RabbitMQ Sample Testcontainers RabbitMQ Sample https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -163,17 +163,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.amqp spring-rabbit-test @@ -246,14 +235,14 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR3 + 2020.0.0-M2 import pom org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -267,14 +256,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 95ce905a..40707d34 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 5.3.0.RELEASE + 5.4.0 Travel Services Sample Travel Services Sample https://projects.spring.io/spring-integration @@ -145,8 +145,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 4609744f..12cc2856 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 5.3.0.RELEASE + 5.4.0 Transaction Synchronization Sample Transaction Synchronization Sample https://projects.spring.io/spring-integration @@ -146,8 +146,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom