From 7996eabbc14e8a9c3a3c9e29bf7239018d4a5673 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 25 Jan 2017 16:14:00 -0500 Subject: [PATCH] Update to Spring Integration 4.3,7 --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 50 ++++++++- applications/cafe-scripted/pom.xml | 8 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 100 +++++++++++++++++- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- applications/stomp-chat/pom.xml | 54 ++++++++++ basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 72 ++++++++++++- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/pom.xml | 2 +- basic/file/pom.xml | 2 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 2 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 2 +- basic/jms/pom.xml | 6 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 32 +++++- basic/kafka/pom.xml | 62 ++++++++++- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/mqtt/pom.xml | 28 ++++- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/splunk/pom.xml | 50 ++++++++- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-client-server/pom.xml | 4 +- basic/testing-examples/pom.xml | 8 +- basic/twitter/pom.xml | 2 +- basic/web-sockets/pom.xml | 42 ++++++++ basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 2 +- basic/xmpp/pom.xml | 2 +- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 62 ++++++++++- dsl/kafka-dsl/pom.xml | 62 ++++++++++- dsl/si4demo/pom.xml | 90 ++++++++++++++++ intermediate/async-gateway/pom.xml | 2 +- intermediate/dynamic-poller/pom.xml | 2 +- intermediate/errorhandling/pom.xml | 2 +- intermediate/file-processing/pom.xml | 2 +- intermediate/mail-attachments/pom.xml | 6 +- intermediate/monitoring/pom.xml | 6 +- intermediate/multipart-http/pom.xml | 2 +- intermediate/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 8 +- .../splitter-aggregator-reaper/pom.xml | 2 +- intermediate/stored-procedures-derby/pom.xml | 2 +- intermediate/stored-procedures-ms/pom.xml | 2 +- intermediate/stored-procedures-oracle/pom.xml | 2 +- .../stored-procedures-postgresql/pom.xml | 2 +- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 62 files changed, 765 insertions(+), 93 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 1c5390e7..ca3455f5 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-groovy - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index de3749b1..81ff51d4 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index f08c08d0..7732c5f9 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -61,47 +61,95 @@ org.springframework.boot spring-boot-starter-integration compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-java-dsl 1.2.1.RELEASE compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index c23b0114..4c36ca7b 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-groovy - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-rmi - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-jmx - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 65d07d19..d4db86e2 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 85162cf5..f3ec9062 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index c884f86f..cc9f592e 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index b03c4b6d..8be69b54 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -61,88 +61,178 @@ org.springframework.boot spring-boot-starter-web compile + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-integration compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-ftp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-mail - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-java-dsl 1.2.1.RELEASE compile + + + commons-logging + commons-logging + + javax.mail javax.mail-api 1.5.5 compile + + + commons-logging + commons-logging + + com.sun.mail javax.mail 1.5.5 compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE test + + + commons-logging + commons-logging + + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index ce36dabe..11743f0a 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 7a1912f9..c442f55f 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -55,7 +55,7 @@ org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index a0c27662..52f06e79 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -61,50 +61,104 @@ org.springframework.boot spring-boot-starter-websocket compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-websocket compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-event compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-groovy compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 4826b337..38366461 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 468bf320..ab9a9929 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -61,63 +61,129 @@ org.springframework.boot spring-boot-starter-web compile + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-integration compile + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-amqp compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index d7d61ae4..aefd6ac5 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index d9e102ed..9f174664 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 97014716..35dacdfd 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-feed - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 424c1138..a9ac5feb 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 7b680289..4743d177 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ftp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile @@ -116,7 +116,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE test diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 0161e642..3a009e1e 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 9ab9e71d..25e94c80 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -55,13 +55,13 @@ org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-mail - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index b21c9bcf..72ed5f12 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 4b385535..b358cd26 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jms - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile @@ -110,7 +110,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE test diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 0102d7a1..7a1c829c 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jmx - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index dc5da5d1..23f20f1c 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-jpa - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile @@ -157,29 +157,59 @@ junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 165d867d..308ed80c 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -61,36 +61,96 @@ org.springframework.boot spring-boot-starter-integration compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-kafka 2.1.0.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.kafka spring-kafka 1.1.0.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.kafka spring-kafka-test 1.1.0.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + log4j log4j 1.2.17 compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + junit diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index c66d5e5d..f5cdad2c 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-mail - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 089c1e8d..b4755c41 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-mongodb - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 395ded25..dd27a1c5 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -61,24 +61,48 @@ org.springframework.boot spring-boot-starter-integration compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-mqtt - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-java-dsl 1.2.1.RELEASE compile + + + commons-logging + commons-logging + + junit diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index cd085cd2..ff39cc85 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 36f96a6c..c03d3273 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index ba0788a1..17b20218 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-sftp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 1beb2ce8..39fb4178 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -61,47 +61,95 @@ org.springframework.boot spring-boot-starter-integration compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-splunk 1.1.0.RELEASE compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 66b1d2f0..477df3ad 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index be9f60b3..a95caf84 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile @@ -68,7 +68,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index bbe12616..a3f7f354 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -56,19 +56,19 @@ org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile @@ -110,7 +110,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE test diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 76d69113..a599ba53 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-twitter - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index b8f27eef..39b9e7eb 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -61,40 +61,82 @@ org.springframework.boot spring-boot-starter-websocket compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-websocket compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 0f91e0b8..b7683034 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -55,13 +55,13 @@ org.springframework.integration spring-integration-xml - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index f6e31199..6490163d 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 8dc11f1b..23efe6d7 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xml - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 36db0cda..31f92db1 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xmpp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/build.gradle b/build.gradle index 0509e172..0044ddba 100644 --- a/build.gradle +++ b/build.gradle @@ -196,7 +196,7 @@ subprojects { subproject -> postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.11' - springIntegrationVersion = '4.3.6.BUILD-SNAPSHOT' + springIntegrationVersion = '4.3.7.RELEASE' springIntegrationDslVersion = '1.2.1.RELEASE' springIntegrationKafkaVersion = '2.1.0.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index b84ff814..fe119a78 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -62,58 +62,118 @@ cafe-si 4.3.0.BUILD-SNAPSHOT compile + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-integration compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + commons-logging + commons-logging + + com.google.guava guava 16.0.1 compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-java-dsl 1.2.1.RELEASE compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 05f39c64..95f5e76d 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -61,36 +61,96 @@ org.springframework.boot spring-boot-starter-integration compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-java-dsl 1.2.1.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-kafka 2.1.0.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + org.springframework.kafka spring-kafka-test 1.1.0.RELEASE compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + log4j log4j 1.2.17 compile + + + hamcrest-core + org.hamcrest + + + commons-logging + commons-logging + + junit diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index ffd2ac4f..bd3b4de8 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -61,84 +61,174 @@ org.springframework.boot spring-boot-starter-web compile + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-integration compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-mail compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-twitter compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-http compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-ip compile + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-java-dsl 1.2.1.RELEASE compile + + + commons-logging + commons-logging + + javax.mail javax.mail-api 1.5.5 compile + + + commons-logging + commons-logging + + com.sun.mail javax.mail 1.5.5 compile + + + commons-logging + commons-logging + + com.rometools rome 1.5.0 compile + + + commons-logging + commons-logging + + junit junit 4.12 test + + + commons-logging + commons-logging + + org.hamcrest hamcrest-all 1.3 test + + + commons-logging + commons-logging + + org.mockito mockito-core 1.10.19 test + + + commons-logging + commons-logging + + org.springframework spring-test 4.3.2.RELEASE test + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-test test + + + commons-logging + commons-logging + + diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 7c67eebc..35302234 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 4a357cbf..7cecf48e 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 877e4b3a..6ae71023 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 9622c88d..a76b3f28 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 950892d2..da509538 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile @@ -116,7 +116,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE test diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a09b3668..4375fed6 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -55,19 +55,19 @@ org.springframework.integration spring-integration-jmx - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-twitter - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-groovy - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 4472e43f..ac88800f 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -55,7 +55,7 @@ org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 5ac4af7b..8f741652 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -55,7 +55,7 @@ org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 6e056422..c249e59c 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-ftp - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 2daeff26..9efa9c2d 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 202ca4b1..70f29fdd 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 0d15bdf2..da23e850 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 1bae3534..9bf42a87 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 2669b9d6..66d996c0 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index bf35c38c..78f90f83 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile @@ -92,7 +92,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE test diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 48ee5271..a1bf5214 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 187137c7..5afdc090 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.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 4.3.7.RELEASE compile