diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 2c365409c..d239d651b 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -62,13 +62,13 @@ org.springframework.integration spring-integration-jms - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-groovy - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index f0f29d993..9a7e17566 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ftp - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 9982c939b..8022e8b92 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-groovy - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-rmi - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-jmx - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -122,7 +122,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 82175b44b..4231fb9f6 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -62,7 +62,7 @@ org.springframework.integration spring-integration-amqp - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 00cc4903b..4043da352 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -74,7 +74,7 @@ org.springframework.integration spring-integration-jms - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index f0b704e89..719f78341 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 318dabcbb..00574a9df 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 8b851f7cb..35be8d88c 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -55,31 +55,31 @@ org.springframework.integration spring-integration-ip - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-webmvc - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-orm - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-aop - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-aspects - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -91,19 +91,19 @@ org.springframework spring-jdbc - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-tx - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-context - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -235,7 +235,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 04d39e878..aa8b7c9e9 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples stomp-chat @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/amqp-affinity/pom.xml b/basic/amqp-affinity/pom.xml index 12ffb7ce1..ca7070adf 100644 --- a/basic/amqp-affinity/pom.xml +++ b/basic/amqp-affinity/pom.xml @@ -72,7 +72,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 1b2c4af86..2ca6006f9 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-amqp - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 4fa10df56..44b57f1b0 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples barrier @@ -75,19 +75,19 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-amqp - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-http - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -111,7 +111,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 007f32a8d..60baa359c 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index f8fccc683..b38fdcc07 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 25dba6f59..caa3b67e4 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-feed - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b00a06f6f..f835273b6 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-file - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 94eda82cb..fddf97ec7 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ftp - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test @@ -116,7 +116,7 @@ org.springframework.integration spring-integration-test - 4.3.0.RELEASE + 4.3.1.RELEASE test diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 3f40f301d..8d9aaf507 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/http-boot/pom.xml b/basic/http-boot/pom.xml index 9ad31e76b..c7323d092 100644 --- a/basic/http-boot/pom.xml +++ b/basic/http-boot/pom.xml @@ -72,7 +72,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 592344ebc..47cc0f5d2 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -55,19 +55,19 @@ org.springframework.integration spring-integration-http - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-mail - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-webmvc - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -121,7 +121,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 2c0f652d4..808f1342d 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index eb302de6e..95fd61a27 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jms - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -104,13 +104,13 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test org.springframework.integration spring-integration-test - 4.3.0.RELEASE + 4.3.1.RELEASE test diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index a07d48410..9efdd9dde 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jmx - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index a2fba86ff..8f195b79d 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples jpa @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-jpa - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -107,7 +107,7 @@ org.springframework spring-instrument - 4.3.0.RELEASE + 4.3.2.RELEASE runtime @@ -173,7 +173,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index b52f8a3bd..5ff94b69d 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples kafka @@ -65,19 +65,25 @@ org.springframework.integration spring-integration-kafka - 2.0.0.RELEASE + 2.0.1.RELEASE compile org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE + compile + + + org.springframework.kafka + spring-kafka + 1.1.0.M1 compile org.springframework.kafka spring-kafka-test - 1.0.1.RELEASE + 1.1.0.M1 compile @@ -107,7 +113,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index f10773d86..df8f3b97b 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-mail - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-context - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 30ba687ef..eb705f47f 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-mongodb - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 0c911d0d3..090d003ee 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples mqtt @@ -65,19 +65,19 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-mqtt - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-java-dsl - 1.1.2.RELEASE + 1.2.0.M1 compile @@ -101,7 +101,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 067e638ae..39ae9ac6f 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index ba979369a..9b4fe9a58 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 255887303..931336655 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-sftp - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 58be58f45..8be3e074b 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples splunk @@ -65,7 +65,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -95,7 +95,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index a813a7b3e..4c9810ebd 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-amqp - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-ip - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 5fde94c27..35c364ee8 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -68,7 +68,7 @@ org.springframework.integration spring-integration-test - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index f5bd4d232..06118f658 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-file - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-http - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-ws - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-webmvc - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -104,13 +104,13 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test org.springframework.integration spring-integration-test - 4.3.0.RELEASE + 4.3.1.RELEASE test diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 1bc2a16ad..c69cf19cb 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-twitter - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index bd6213756..7a22cf634 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples web-sockets @@ -88,7 +88,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index b46a61a3b..32f0161ad 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -55,19 +55,19 @@ org.springframework.integration spring-integration-xml - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-ws - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-webmvc - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -97,7 +97,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 783190f05..6078626a1 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-ws - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 37dadf6ff..11d6fea34 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xml - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index d4667f2a4..31a35e8d1 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xmpp - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/build.gradle b/build.gradle index 8cd862f38..660fbfa80 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,6 @@ allprojects { group = 'org.springframework.integration.samples' repositories { - mavenLocal() maven { url 'http://repo.spring.io/libs-snapshot' } maven { url 'http://repo.spring.io/libs-milestone' } // maven { url 'http://repo.spring.io/libs-staging-local' } @@ -193,12 +192,12 @@ subprojects { subproject -> mockitoVersion = '1.9.5' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' - reactorVersion = '2.0.7.RELEASE' + reactorVersion = '2.0.8.RELEASE' postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.11' springIntegrationVersion = '4.3.1.RELEASE' - springIntegrationDslVersion = '1.1.2.RELEASE' + springIntegrationDslVersion = '1.2.0.M1' springIntegrationKafkaVersion = '2.0.1.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '1.1.0.M1' @@ -702,8 +701,6 @@ project('cafe-dsl') { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" compile "com.google.guava:guava:$guavaVersion" compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" - compile "io.projectreactor:reactor-stream:$reactorVersion" - compile "io.projectreactor.spring:reactor-spring-context:$reactorVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -1011,7 +1008,6 @@ project('async-gateway') { dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" compile "io.projectreactor:reactor-stream:$reactorVersion" - compile "io.projectreactor.spring:reactor-spring-context:$reactorVersion" compile "log4j:log4j:$log4jVersion" } } @@ -1343,6 +1339,38 @@ project('stomp-chat') { } } +project('kafka-dsl') { + description = 'Java DSL Kafka Sample' + + apply plugin: 'spring-boot' + + sourceCompatibility = 1.8 + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" + compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" + compile ("org.springframework.kafka:spring-kafka-test:$springKafkaVersion") { + exclude group: 'org.slf4j' + } + compile "log4j:log4j:$log4jVersion" + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + springBoot { + mainClass = 'org.springframework.integration.samples.dsl.kafka.Application' + } + + task run(type: JavaExec) { + main 'org.springframework.integration.samples.dsl.kafka.Application' + classpath = sourceSets.main.runtimeClasspath + } + + tasks.withType(JavaExec) { + standardInput = System.in + } +} + sonarqube { properties { property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index c6ae75d70..d9f884b87 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples cafe-dsl @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -83,19 +83,7 @@ org.springframework.integration spring-integration-java-dsl - 1.1.2.RELEASE - compile - - - io.projectreactor - reactor-stream - 2.0.7.RELEASE - compile - - - io.projectreactor.spring - reactor-spring-context - 2.0.7.RELEASE + 1.2.0.M1 compile @@ -119,7 +107,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/nonlambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/nonlambda/Application.java index c4c097187..da407de29 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/nonlambda/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/nonlambda/Application.java @@ -104,12 +104,12 @@ public IntegrationFlow orders() { .split("payload.items") .channel(MessageChannels.executor(Executors.newCachedThreadPool())) .route("payload.iced", - new Consumer>() { + new Consumer>() { @Override - public void accept(RouterSpec spec) { - spec.channelMapping("true", "iced") - .channelMapping("false", "hot"); + public void accept(RouterSpec spec) { + spec.channelMapping(true, "iced") + .channelMapping(false, "hot"); } }) diff --git a/dsl/kafka-dsl/README.md b/dsl/kafka-dsl/README.md new file mode 100644 index 000000000..5512facda --- /dev/null +++ b/dsl/kafka-dsl/README.md @@ -0,0 +1,36 @@ +Spring Integration Java DSL and Apache Kafka Sample +============== + +This example demonstrates the use of `Kafka09` Namespace Factory from Spring Integration Java DSL. + +## Running the sample + +Start Apache Zookeeper and Apache Kafka according to the documentation for the Apache Kafka project. + + $ gradlew :kafka:run + +This will package the application and run it using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) + +#### Using an IDE such as SpringSource Tool Suite™ (STS) + +In STS (Eclipse), go to package **org.springframework.integration.samples.kafka**, right-click **Application** and select **Run as** --> **Java Application** (or Spring Boot Application). + +### Output + +The application sends 10 messages (`foo0` ... `foo9`) to a kafka topic `si.topic` (which is created if necessary). + +The message-driven adapter receives the messages and places them in a `QueueChannel` which the application reads and +writes to stdout: + + GenericMessage [payload=foo0, headers={kafka_offset=21, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=22}] + GenericMessage [payload=foo1, headers={kafka_offset=22, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=23}] + GenericMessage [payload=foo2, headers={kafka_offset=23, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=24}] + GenericMessage [payload=foo3, headers={kafka_offset=24, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=25}] + GenericMessage [payload=foo4, headers={kafka_offset=25, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=26}] + GenericMessage [payload=foo5, headers={kafka_offset=26, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=27}] + GenericMessage [payload=foo6, headers={kafka_offset=27, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=28}] + GenericMessage [payload=foo7, headers={kafka_offset=28, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=29}] + GenericMessage [payload=foo8, headers={kafka_offset=29, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=30}] + GenericMessage [payload=foo9, headers={kafka_offset=30, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=31}] + +Notice that the offset header increases on each run (the topic is not removed, to demonstrate that the offset is retained between executions). diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml new file mode 100644 index 000000000..a46d915b0 --- /dev/null +++ b/dsl/kafka-dsl/pom.xml @@ -0,0 +1,140 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 1.4.0.RELEASE + + org.springframework.integration.samples + kafka-dsl + 4.3.0.BUILD-SNAPSHOT + Java DSL Kafka Sample + Java DSL Kafka Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@pivotal.io + + project lead + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + abilan + Artem Bilan + abilan@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-core + 4.3.1.RELEASE + compile + + + org.springframework.integration + spring-integration-java-dsl + 1.2.0.M1 + compile + + + org.springframework.kafka + spring-kafka + 1.1.0.M1 + compile + + + org.springframework.kafka + spring-kafka-test + 1.1.0.M1 + compile + + + log4j + log4j + 1.2.17 + compile + + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.3.2.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java new file mode 100644 index 000000000..2d6473cb7 --- /dev/null +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -0,0 +1,158 @@ +/* + * Copyright 2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.dsl.kafka; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import javax.annotation.PostConstruct; + +import org.I0Itec.zkclient.ZkClient; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.serialization.StringSerializer; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.integration.annotation.Gateway; +import org.springframework.integration.annotation.IntegrationComponentScan; +import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.integration.dsl.kafka.Kafka09; +import org.springframework.kafka.core.ConsumerFactory; +import org.springframework.kafka.core.DefaultKafkaConsumerFactory; +import org.springframework.kafka.core.DefaultKafkaProducerFactory; +import org.springframework.kafka.core.ProducerFactory; +import org.springframework.messaging.Message; + +import kafka.admin.AdminUtils; +import kafka.common.TopicExistsException; +import kafka.utils.ZKStringSerializer$; +import kafka.utils.ZkUtils; + +/** + * @author Gary Russell + * @author Artem Bilan + * @since 4.3 + */ +@SpringBootApplication +@IntegrationComponentScan +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext context = + new SpringApplicationBuilder(Application.class) + .web(false) + .run(args); + + KafkaGateway kafkaGateway = context.getBean(KafkaGateway.class); + for (int i = 0; i < 10; i++) { + String message = "foo" + i; + System.out.println("Send to Kafka: " + message); + kafkaGateway.sendToKafka(message); + } + + Message received = kafkaGateway.receiveFromKafka(); + while (received != null) { + System.out.println(received); + received = kafkaGateway.receiveFromKafka(); + } + + context.close(); + System.exit(0); + } + + @Value("${kafka.topic}") + private String topic; + + @Value("${kafka.messageKey}") + private String messageKey; + + @Value("${kafka.broker.address}") + private String brokerAddress; + + @Value("${kafka.zookeeper.connect}") + private String zookeeperConnect; + + @PostConstruct + public void init() { + ZkClient zkClient = new ZkClient(this.zookeeperConnect, 6000, 6000, ZKStringSerializer$.MODULE$); + ZkUtils zkUtils = new ZkUtils(zkClient, null, false); + try { + AdminUtils.createTopic(zkUtils, topic, 1, 1, new Properties(), null); + } + catch (TopicExistsException e) { + // no-op + } + } + + @MessagingGateway + public interface KafkaGateway { + + @Gateway(requestChannel = "toKafka.input") + void sendToKafka(String payload); + + @Gateway(replyChannel = "fromKafka", replyTimeout = 10000) + Message receiveFromKafka(); + + } + + + @Bean + public ProducerFactory producerFactory() { + Map props = new HashMap<>(); + props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, this.brokerAddress); + props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class); + props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class); + return new DefaultKafkaProducerFactory<>(props); + } + + @Bean + public IntegrationFlow toKafka() { + return f -> f + .handle(Kafka09.outboundChannelAdapter(producerFactory()) + .topic(this.topic) + .messageKey(this.messageKey)); + } + + @Bean + public ConsumerFactory consumerFactory() { + Map props = new HashMap<>(); + props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, this.brokerAddress); + props.put(ConsumerConfig.GROUP_ID_CONFIG, "siTestGroup"); + props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, true); + props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + return new DefaultKafkaConsumerFactory<>(props); + } + + @Bean + public IntegrationFlow fromKafka() { + return IntegrationFlows + .from(Kafka09.messageDriverChannelAdapter(consumerFactory(), this.topic)) + .channel(c -> c.queue("fromKafka")) + .get(); + } + +} diff --git a/dsl/kafka-dsl/src/main/resources/application.yml b/dsl/kafka-dsl/src/main/resources/application.yml new file mode 100644 index 000000000..02f3a96c5 --- /dev/null +++ b/dsl/kafka-dsl/src/main/resources/application.yml @@ -0,0 +1,7 @@ +kafka: + broker: + address: localhost:9092 + zookeeper: + connect: localhost:2181 + topic: si.topic + messageKey: si.key diff --git a/dsl/kafka-dsl/src/main/resources/logback.xml b/dsl/kafka-dsl/src/main/resources/logback.xml new file mode 100644 index 000000000..070671efc --- /dev/null +++ b/dsl/kafka-dsl/src/main/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/dsl/pom.xml b/dsl/pom.xml index d7b28d001..3266ce587 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -72,7 +72,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 91a2d6b1c..20c4d34b5 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RC1 + 1.4.0.RELEASE org.springframework.integration.samples si4demo @@ -90,7 +90,7 @@ org.springframework.integration spring-integration-java-dsl - 1.1.2.RELEASE + 1.2.0.M1 compile @@ -132,7 +132,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/gradle.properties b/gradle.properties index 755afaf0b..bc2cc5fa3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=4.3.0.BUILD-SNAPSHOT -springBootVersion=1.4.0.RC1 +springBootVersion=1.4.0.RELEASE org.gradle.daemon=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index c8b71d9c9..da98e2956 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -56,19 +56,13 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile io.projectreactor reactor-stream - 2.0.7.RELEASE - compile - - - io.projectreactor.spring - reactor-spring-context - 2.0.7.RELEASE + 2.0.8.RELEASE compile @@ -98,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java b/intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java index 040da8a71..0e854b0c5 100644 --- a/intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java +++ b/intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java @@ -23,9 +23,9 @@ */ public class MathService { private final Random random = new Random(); - + public int multiplyByTwo(int i) throws Exception{ - long sleep = random.nextInt(10) * 500; + long sleep = random.nextInt(10) * 100; Thread.sleep(sleep); return i*2; } diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/PromiseTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/PromiseTest.java index e9a08ec40..c849290b4 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/PromiseTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/PromiseTest.java @@ -47,7 +47,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.rx.Promise; -import reactor.spring.context.config.EnableReactor; /** * @author Oleg Zhurakousky @@ -97,29 +96,16 @@ public void testPromiseGateway() throws Exception { @Configuration @EnableIntegration - @EnableReactor @ComponentScan @IntegrationComponentScan public static class TestConfig { - @Bean - public MessageChannel gatewayChannel() { - return new DirectChannel(); - } - @Bean @ServiceActivator(inputChannel = "mathServiceChannel") public MathService mathService() { return new MathService(); } - @Bean - public AsyncTaskExecutor exec() { - SimpleAsyncTaskExecutor simpleAsyncTaskExecutor = new SimpleAsyncTaskExecutor(); - simpleAsyncTaskExecutor.setThreadNamePrefix("exec-"); - return simpleAsyncTaskExecutor; - } - } @MessagingGateway(defaultReplyTimeout = "0", reactorEnvironment = "reactorEnv") diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 7650ab171..3f77e77db 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 39cb3079c..13d0185ac 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 4151f27cd..0c5ee9542 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-file - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 47cfd8d37..837bfc0fa 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-mail - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-file - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -110,13 +110,13 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test org.springframework.integration spring-integration-test - 4.3.0.RELEASE + 4.3.1.RELEASE test diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index e324391a8..9d73f2e82 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -55,25 +55,25 @@ org.springframework.integration spring-integration-jmx - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-twitter - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-groovy - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-webmvc - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -109,7 +109,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fe059c6e5..45ccaae77 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -55,13 +55,13 @@ org.springframework.integration spring-integration-http - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-webmvc - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -109,7 +109,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index a9fcc5b7d..956f5b756 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -55,43 +55,43 @@ org.springframework.integration spring-integration-http - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-webmvc - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-oxm - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-tx - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-jdbc - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-context - 4.3.0.RELEASE + 4.3.2.RELEASE compile org.springframework spring-aop - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -145,7 +145,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d806103d5..62944de80 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-stream - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-amqp - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-ftp - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-file - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 93fd30b00..32c536e73 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index b75fcd3f4..bc2e9778e 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 10a056948..d0ec3c093 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 4c1d8baf6..7a61de9bc 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index fe38c9922..f8b4cc411 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index da985cefd..fc422da06 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -86,13 +86,13 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test org.springframework.integration spring-integration-test - 4.3.0.RELEASE + 4.3.1.RELEASE test diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 91fae7d19..6c22c8ccb 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -56,19 +56,19 @@ org.springframework.integration spring-integration-ws - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-http - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework spring-web - 4.3.0.RELEASE + 4.3.2.RELEASE compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 654417405..96df81dc4 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jdbc - 4.3.0.RELEASE + 4.3.1.RELEASE compile org.springframework.integration spring-integration-file - 4.3.0.RELEASE + 4.3.1.RELEASE compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.0.RELEASE + 4.3.2.RELEASE test