From a5c12343c675d64b4ad45c9298464ef9c032ab60 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 10 Sep 2014 19:06:28 +0300 Subject: [PATCH] INTSAMPLES-137: Add WebSockets sample JIRA: https://jira.spring.io/browse/INTSAMPLES-137 Depends on https://github.com/spring-projects/spring-integration/pull/1274 Polishing and cleanup * Fix `cafe-dsl` project: https://build.spring.io/browse/INTSAMPLES-NIGHTLY-JOB1-1131 * Change author emails to the `pivotal.io` * Regenerate poms Fix for `Cafe-DSL` sample https://build.spring.io/browse/INTSAMPLES-NIGHTLY-JOB1-1143 --- advanced/advanced-testing-examples/pom.xml | 36 ++--- advanced/dynamic-ftp/pom.xml | 34 ++--- advanced/pom.xml | 10 +- applications/cafe-scripted/pom.xml | 38 ++--- applications/cafe/cafe-amqp/pom.xml | 36 ++--- applications/cafe/cafe-jms/pom.xml | 36 ++--- applications/cafe/cafe-si/pom.xml | 34 ++--- applications/cafe/pom.xml | 10 +- applications/loan-broker/pom.xml | 34 ++--- applications/loanshark/pom.xml | 98 ++++++------ applications/pom.xml | 10 +- basic/amqp/pom.xml | 42 +++--- basic/control-bus/pom.xml | 24 +-- basic/enricher/pom.xml | 24 +-- basic/feed/pom.xml | 34 ++--- basic/file/pom.xml | 34 ++--- basic/ftp/pom.xml | 46 +++--- basic/helloworld/pom.xml | 24 +-- basic/http/pom.xml | 32 ++-- basic/jdbc/pom.xml | 30 ++-- basic/jms/pom.xml | 46 +++--- basic/jmx/pom.xml | 38 ++--- basic/jpa/pom.xml | 36 ++--- basic/mail/pom.xml | 36 ++--- basic/mongodb/pom.xml | 24 +-- basic/oddeven/pom.xml | 24 +-- basic/pom.xml | 10 +- basic/quote/pom.xml | 34 ++--- basic/sftp/pom.xml | 32 ++-- basic/tcp-amqp/pom.xml | 34 ++--- basic/tcp-client-server/pom.xml | 36 ++--- basic/testing-examples/pom.xml | 38 ++--- basic/twitter/pom.xml | 24 +-- basic/web-sockets/README.md | 29 ++++ basic/web-sockets/pom.xml | 123 +++++++++++++++ .../standard/client/Application.java | 34 +++++ .../standard/server/Application.java | 142 ++++++++++++++++++ .../standard/client/client-context.xml | 24 +++ .../src/main/resources/static/index.html | 34 +++++ .../websocket/standard/ApplicationTests.java | 85 +++++++++++ basic/ws-inbound-gateway/pom.xml | 36 ++--- basic/ws-outbound-gateway/pom.xml | 38 ++--- basic/xml/pom.xml | 32 ++-- basic/xmpp/pom.xml | 30 ++-- build.gradle | 34 ++++- dsl/cafe-dsl/pom.xml | 129 ++++++++++++++++ .../samples/dsl/cafe/Application.java | 3 + dsl/pom.xml | 92 ++++++++++++ dsl/si4demo/pom.xml | 134 +++++++++++++++++ intermediate/async-gateway/pom.xml | 30 ++-- intermediate/dynamic-poller/pom.xml | 24 +-- intermediate/errorhandling/pom.xml | 34 ++--- intermediate/file-processing/pom.xml | 34 ++--- intermediate/mail-attachments/pom.xml | 48 +++--- intermediate/monitoring/pom.xml | 42 +++--- intermediate/multipart-http/pom.xml | 32 ++-- intermediate/pom.xml | 10 +- intermediate/rest-http/pom.xml | 74 ++++----- intermediate/retry-and-more/pom.xml | 56 +++---- .../splitter-aggregator-reaper/pom.xml | 24 +-- intermediate/stored-procedures-derby/pom.xml | 30 ++-- intermediate/stored-procedures-ms/pom.xml | 30 ++-- intermediate/stored-procedures-oracle/pom.xml | 36 ++--- .../stored-procedures-postgresql/pom.xml | 30 ++-- .../tcp-client-server-multiplex/pom.xml | 36 ++--- intermediate/travel/pom.xml | 40 ++--- intermediate/tx-synch/pom.xml | 38 ++--- 67 files changed, 1792 insertions(+), 933 deletions(-) create mode 100644 basic/web-sockets/README.md create mode 100644 basic/web-sockets/pom.xml create mode 100644 basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java create mode 100644 basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java create mode 100644 basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml create mode 100644 basic/web-sockets/src/main/resources/static/index.html create mode 100644 basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java create mode 100644 dsl/cafe-dsl/pom.xml create mode 100644 dsl/pom.xml create mode 100644 dsl/si4demo/pom.xml diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 6f81d6721..baa05c9a3 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Advanced Testing Examples Advanced Testing Examples http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,10 +60,16 @@ + + org.springframework.integration + spring-integration-groovy + 4.0.4.RELEASE + compile + org.springframework.integration spring-integration-jms - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -78,6 +84,12 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + javax.jms jms-api @@ -90,23 +102,11 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-groovy - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index d6e881029..a921b5ce0 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Dynamic FTP Demo Dynamic FTP Demo http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-ftp - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-ftp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/advanced/pom.xml b/advanced/pom.xml index 68aa7f9aa..dbe052540 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 7be0ee76b..5c3d96f2e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -62,14 +62,14 @@ org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE + spring-integration-groovy + 4.0.4.RELEASE compile org.springframework.integration spring-integration-rmi - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -85,15 +85,15 @@ test - org.springframework.integration - spring-integration-jmx - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test org.codehaus.groovy groovy-all - 2.2.2 + 2.3.0 compile @@ -110,8 +110,8 @@ org.springframework.integration - spring-integration-groovy - 4.0.0.RELEASE + spring-integration-stream + 4.0.4.RELEASE compile @@ -127,10 +127,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-jmx + 4.0.4.RELEASE + compile diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 09326c6a0..385b49cfb 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + junit junit @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -85,9 +91,9 @@ compile - org.springframework.integration.samples - cafe-si - 2.2.0.BUILD-SNAPSHOT + org.springframework.integration + spring-integration-amqp + 4.0.4.RELEASE compile @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index c620d0450..e32d18977 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe - With JMS Message Broker Cafe - With JMS Message Broker http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,10 +60,16 @@ + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + org.springframework.integration spring-integration-jms - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -78,30 +84,24 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework.integration.samples - cafe-si - 2.2.0.BUILD-SNAPSHOT - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - org.apache.activemq activemq-broker diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index a55b39c6c..59e733885 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe - Pure Spring Integration Cafe - Pure Spring Integration http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -78,12 +72,24 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + com.fasterxml.jackson.core jackson-databind @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 13dbcc2b1..d61bdbdcb 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 66f28f694..d653118e8 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Loan Broker Sample Loan Broker Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + junit junit @@ -72,29 +78,23 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 6b679bd03..4e44479b7 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war Loan Shark Sample Loan Shark Sample @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -75,12 +75,6 @@ - - org.springframework - spring-context - 4.0.3.RELEASE - compile - org.slf4j slf4j-log4j12 @@ -99,12 +93,6 @@ 4.11 test - - org.springframework - spring-jdbc - 4.0.3.RELEASE - compile - commons-fileupload commons-fileupload @@ -112,39 +100,39 @@ compile - org.aspectj - aspectjtools - 1.8.0 + org.springframework + spring-aop + 4.0.7.RELEASE compile - org.hibernate - hibernate-entitymanager - 4.2.11.Final + org.springframework + spring-context + 4.0.7.RELEASE compile - commons-pool - commons-pool - 1.5.4 + org.aspectj + aspectjtools + 1.8.0 compile org.springframework - spring-aop - 4.0.3.RELEASE + spring-webmvc + 4.0.7.RELEASE compile - org.springframework - spring-tx - 4.0.3.RELEASE + org.hibernate + hibernate-entitymanager + 4.2.11.Final compile - org.springframework - spring-aspects - 4.0.3.RELEASE + commons-pool + commons-pool + 1.5.4 compile @@ -191,14 +179,14 @@ org.springframework - spring-test - 4.0.3.RELEASE - test + spring-jdbc + 4.0.7.RELEASE + compile - org.springframework - spring-webmvc - 4.0.3.RELEASE + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE compile @@ -208,9 +196,21 @@ compile - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework + spring-orm + 4.0.7.RELEASE + compile + + + org.springframework + spring-aspects + 4.0.7.RELEASE compile @@ -225,18 +225,18 @@ 1.3 test - - org.springframework - spring-orm - 4.0.3.RELEASE - compile - commons-digester commons-digester 2.0 compile + + org.springframework + spring-tx + 4.0.7.RELEASE + compile + net.sf.flexjson flexjson diff --git a/applications/pom.xml b/applications/pom.xml index 4c927b2fa..761bca6e7 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index e9df737b0..e45bd308f 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples amqp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT AMQP Basic Sample AMQP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -79,10 +73,10 @@ test - org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -90,17 +84,23 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + + + org.springframework.integration + spring-integration-amqp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 20a3fae5b..f400d5403 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Control Bus Basic Sample Control Bus Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index ab10e3c59..aab6903b1 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples enricher - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Enricher Basic Sample Enricher Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,10 +78,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index e725d5071..21d72a6e2 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples feed - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-feed - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-feed + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b577e002c..353d5fef7 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples file - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT File Copy Basic Sample File Copy Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,18 @@ 1.3 test + + org.springframework.integration + spring-integration-file + 4.0.4.RELEASE + compile + + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -84,17 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile - diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 9d198498b..915b5f49a 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ftp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT FTP Basic Sample FTP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -66,12 +66,6 @@ 1.7.6 compile - - org.springframework.integration - spring-integration-ftp - 4.0.0.RELEASE - compile - junit junit @@ -84,41 +78,47 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + commons-io commons-io 2.4 compile - - org.springframework.integration - spring-integration-test - 4.0.0.RELEASE - test - org.apache.ftpserver ftpserver-core 1.0.6 compile + + org.springframework.integration + spring-integration-test + 4.0.4.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-ftp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 14bc2d5cc..2e4b9db8d 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Hello World Sample Hello World Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/http/pom.xml b/basic/http/pom.xml index e99ee3849..ca36903e2 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples http - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war HTTP Sample HTTP Sample @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,7 +78,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -95,10 +95,16 @@ org.springframework.integration - spring-integration-http - 4.0.0.RELEASE + spring-integration-mail + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + commons-io commons-io @@ -107,8 +113,8 @@ org.springframework.integration - spring-integration-mail - 4.0.0.RELEASE + spring-integration-http + 4.0.4.RELEASE compile @@ -135,11 +141,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 4ed7c84eb..c4f3578cf 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JDBC Basic Sample JDBC Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + com.h2database h2 @@ -79,10 +85,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index dfd43b9b2..fd15f588f 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jms - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JMS Basic Sample JMS Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -61,21 +61,15 @@ - org.springframework.integration - spring-integration-jms - 4.0.0.RELEASE + org.slf4j + slf4j-log4j12 + 1.7.6 compile org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - - - org.slf4j - slf4j-log4j12 - 1.7.6 + spring-integration-jms + 4.0.4.RELEASE compile @@ -90,10 +84,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test @@ -102,18 +102,18 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - org.apache.activemq activemq-broker diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 172fd55b0..dbe761e34 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jmx - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JMX Basic Sample JMX Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -79,10 +73,10 @@ test - org.springframework.integration - spring-integration-jmx - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -90,6 +84,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core @@ -97,10 +97,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-jmx + 4.0.4.RELEASE + compile diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 30238f61c..1c1ea3296 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jpa - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JPA Basic Sample JPA Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -84,18 +84,18 @@ 4.11 test - - org.springframework - spring-instrument - 4.0.3.RELEASE - runtime - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.apache.openjpa openjpa @@ -105,9 +105,15 @@ org.springframework.integration spring-integration-jpa - 4.0.0.RELEASE + 4.0.4.RELEASE compile + + org.springframework + spring-instrument + 4.0.7.RELEASE + runtime + org.eclipse.persistence javax.persistence @@ -126,11 +132,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 1a7ee7e59..e372611c9 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mail - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework - spring-context - 4.0.3.RELEASE - compile - junit junit @@ -81,9 +75,15 @@ org.springframework.integration spring-integration-mail - 4.0.0.RELEASE + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -102,17 +102,17 @@ 1.4.7 compile + + org.springframework + spring-context + 4.0.7.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index e2d004a69..4919ab879 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT MongoDb Basic Sample MongoDb Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -63,7 +63,7 @@ org.springframework.integration spring-integration-mongodb - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -78,6 +78,12 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 5da4f94fc..ed19b258b 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Odd-Even Sample Odd-Even Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/pom.xml b/basic/pom.xml index acfeb9687..4c0a86208 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 11a7e6610..c50612da3 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples quote - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Quote Sample Quote Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 06eea9708..df3d59303 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples sftp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT SFTP Basic Sample SFTP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -66,6 +66,12 @@ 4.11 test + + org.springframework.integration + spring-integration-sftp + 4.0.4.RELEASE + compile + org.hamcrest hamcrest-all @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-sftp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -91,10 +97,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.apache.sshd + sshd-core + 0.10.1 + compile diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 39a1fb499..71835ef5d 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT TCP-AMQP Basic Sample TCP-AMQP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + org.slf4j slf4j-log4j12 @@ -79,10 +85,10 @@ test - org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -92,8 +98,8 @@ org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE + spring-integration-amqp + 4.0.4.RELEASE compile @@ -102,11 +108,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 63d562942..7a0425acc 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT TCP Client Server Sample TCP Client Server Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + commons-lang commons-lang @@ -78,10 +84,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,23 +102,11 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 4fe9ac3e5..883113892 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Testing Examples Testing Examples http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -63,7 +63,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -80,20 +80,26 @@ org.springframework.integration - spring-integration-http - 4.0.0.RELEASE + spring-integration-file + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE + spring-integration-http + 4.0.4.RELEASE compile org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test @@ -108,16 +114,10 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE + spring-integration-ws + 4.0.4.RELEASE compile diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index ddf3fda0a..f3fdf022f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples twitter - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Twitter Basic Sample Twitter Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-twitter - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/web-sockets/README.md b/basic/web-sockets/README.md new file mode 100644 index 000000000..632ed9b9a --- /dev/null +++ b/basic/web-sockets/README.md @@ -0,0 +1,29 @@ +WebSockets Sample +============== + +This example demonstrates the Standard WebSocket protocol (without any sub-protocols) with Spring Integration Adapters. +It just sends current time from the server to all connected clients. + +## Server + +The server is presented only with a single `org.springframework.integration.samples.websocket.standard.server.Application` +class, which is based on the Spring Boot AutoConfiguration and Spring Integration Java & Annotation configuration. +It is a `main` and starts an embedded Tomcat server on the default `8080` port. The WebSocket endpoint is mapped to the `/time` path. + +The server also can be run from Gradle `gradlew :web-sockets:run` + +## Java Client + +The `org.springframework.integration.samples.websocket.standard.client.Application` is a simple Java application, + which starts an integration flow (`client-context.xml`), connects to the WebSocket server and prints `Message`s to the + logs, which are received over WebSocket. + +## Browser Client + +The `index.html` in the `src/main/resources/static` directory of this project demonstrates a JavaScript `SockJS` client, which connects +to our server and just prints its messages in the middle of page. + +## Test Case + +The `org.springframework.integration.samples.websocket.standard.ApplicationTests` demonstrates the Spring Boot test +framework and starts Server & Client to check, that the client receives correct data. diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml new file mode 100644 index 000000000..fbfc884d1 --- /dev/null +++ b/basic/web-sockets/pom.xml @@ -0,0 +1,123 @@ + + + 4.0.0 + + spring-boot-starter-parent + org.springframework.boot + 1.1.6.RELEASE + + org.springframework.integration.samples + web-sockets + 3.0.0.BUILD-SNAPSHOT + Web Sockets Basic Sample + Web Sockets Basic 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-maven-plugin + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.boot + spring-boot-starter-websocket + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework.integration + spring-integration-websocket + 4.1.0.BUILD-SNAPSHOT + compile + + + diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java new file mode 100644 index 000000000..32c601f37 --- /dev/null +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java @@ -0,0 +1,34 @@ +/* + * Copyright 2014 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.websocket.standard.client; + +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * @author Artem Bilan + * @since 3.0 + */ +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("client-context.xml", Application.class); + System.in.read(); + ctx.close(); + } + +} diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java new file mode 100644 index 000000000..3689de478 --- /dev/null +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java @@ -0,0 +1,142 @@ +/* + * Copyright 2014 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.websocket.standard.server; + +import java.text.DateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.Iterator; +import java.util.concurrent.Executors; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.InboundChannelAdapter; +import org.springframework.integration.annotation.Poller; +import org.springframework.integration.annotation.ServiceActivator; +import org.springframework.integration.annotation.Transformer; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.channel.ExecutorChannel; +import org.springframework.integration.channel.PublishSubscribeChannel; +import org.springframework.integration.core.MessageSource; +import org.springframework.integration.handler.LoggingHandler; +import org.springframework.integration.splitter.DefaultMessageSplitter; +import org.springframework.integration.transformer.AbstractPayloadTransformer; +import org.springframework.integration.transformer.HeaderEnricher; +import org.springframework.integration.transformer.support.ExpressionEvaluatingHeaderValueMessageProcessor; +import org.springframework.integration.websocket.ServerWebSocketContainer; +import org.springframework.integration.websocket.outbound.WebSocketOutboundMessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.simp.SimpMessageHeaderAccessor; +import org.springframework.messaging.support.GenericMessage; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@Configuration +@EnableAutoConfiguration +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = SpringApplication.run(Application.class); + System.out.println("Hit 'Enter' to terminate"); + System.in.read(); + ctx.close(); + } + + @Bean + public ServerWebSocketContainer serverWebSocketContainer() { + return new ServerWebSocketContainer("/time").withSockJs(); + } + + @Bean + @InboundChannelAdapter(value = "splitChannel", poller = @Poller(fixedDelay = "1000", maxMessagesPerPoll = "1")) + public MessageSource webSocketSessionsMessageSource() { + return new MessageSource>() { + + @Override + public Message> receive() { + return new GenericMessage>(serverWebSocketContainer().getSessions().keySet().iterator()); + } + + }; + } + + @Bean + public MessageChannel splitChannel() { + return new DirectChannel(); + } + + @Bean + @ServiceActivator(inputChannel = "splitChannel") + public MessageHandler splitter() { + DefaultMessageSplitter splitter = new DefaultMessageSplitter(); + splitter.setOutputChannelName("headerEnricherChannel"); + return splitter; + } + + @Bean + public MessageChannel headerEnricherChannel() { + return new ExecutorChannel(Executors.newCachedThreadPool()); + } + + @Bean + @Transformer(inputChannel = "headerEnricherChannel", outputChannel = "transformChannel") + public HeaderEnricher headerEnricher() { + return new HeaderEnricher(Collections.singletonMap(SimpMessageHeaderAccessor.SESSION_ID_HEADER, + new ExpressionEvaluatingHeaderValueMessageProcessor("payload", null))); + } + + @Bean + @Transformer(inputChannel = "transformChannel", outputChannel = "sendTimeChannel") + public AbstractPayloadTransformer transformer() { + return new AbstractPayloadTransformer() { + @Override + protected Object transformPayload(Object payload) throws Exception { + return DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).format(new Date()); + } + + }; + } + + + @Bean + public MessageChannel sendTimeChannel() { + return new PublishSubscribeChannel(); + } + + + @Bean + @ServiceActivator(inputChannel = "sendTimeChannel") + public MessageHandler webSocketOutboundAdapter() { + return new WebSocketOutboundMessageHandler(serverWebSocketContainer()); + } + + @Bean + @ServiceActivator(inputChannel = "sendTimeChannel") + public MessageHandler loggingChannelAdapter() { + LoggingHandler loggingHandler = new LoggingHandler("info"); + loggingHandler.setExpression("'The time ' + payload + ' has been sent to the WebSocketSession ' + headers.simpSessionId"); + return loggingHandler; + } + +} diff --git a/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml new file mode 100644 index 000000000..fdfc4f928 --- /dev/null +++ b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/basic/web-sockets/src/main/resources/static/index.html b/basic/web-sockets/src/main/resources/static/index.html new file mode 100644 index 000000000..6721cf2bf --- /dev/null +++ b/basic/web-sockets/src/main/resources/static/index.html @@ -0,0 +1,34 @@ + + + + Time over WebSocket + + + + + + +
Starting...
+ + 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 new file mode 100644 index 000000000..6da9b08e3 --- /dev/null +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -0,0 +1,85 @@ +/* + * Copyright 2014 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.websocket.standard; + +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; + +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Date; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.IntegrationTest; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.samples.websocket.standard.server.Application; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.ChannelInterceptorAdapter; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = Application.class) +@WebAppConfiguration +@IntegrationTest +public class ApplicationTests { + + @Test + public void testWebSockets() throws InterruptedException { + ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("client-context.xml", + org.springframework.integration.samples.websocket.standard.client.Application.class); + DirectChannel webSocketInputChannel = ctx.getBean("webSocketInputChannel", DirectChannel.class); + + final CountDownLatch stopLatch = new CountDownLatch(2); + + webSocketInputChannel.addInterceptor(new ChannelInterceptorAdapter() { + @Override + public void postSend(Message message, MessageChannel channel, boolean sent) { + Object payload = message.getPayload(); + assertThat(payload, instanceOf(String.class)); + Date date = null; + try { + date = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).parse((String) payload); + } + catch (ParseException e) { + fail("fail to parse date"); + } + assertThat(new Date().compareTo(date), greaterThanOrEqualTo(0)); + stopLatch.countDown(); + } + + }); + assertTrue(stopLatch.await(10, TimeUnit.SECONDS)); + ctx.close(); + } + +} diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 61d2f1ab4..bb60ba1e3 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war WS Inbound Gateway Sample WS Inbound Gateway Sample @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,7 +78,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -93,10 +93,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE + spring-integration-xml + 4.0.4.RELEASE compile @@ -105,12 +111,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-xml - 4.0.0.RELEASE - compile - org.mockito mockito-core @@ -118,10 +118,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-ws + 4.0.4.RELEASE + compile diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index f76c377fe..09e44aa54 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT WS Outbound Gateway Sample WS Outbound Gateway Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -79,10 +73,10 @@ test - org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -90,6 +84,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core @@ -97,10 +97,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-ws + 4.0.4.RELEASE + compile diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 941aa6ff9..77508a175 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples xml - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT XML Sample XML Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -73,15 +73,21 @@ test - log4j - log4j - 1.2.17 - compile + org.springframework + spring-test + 4.0.7.RELEASE + test org.springframework.integration spring-integration-xml - 4.0.0.RELEASE + 4.0.4.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 2d0049db9..18643357c 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT XMPP Basic Sample XMPP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -73,10 +73,10 @@ test - org.springframework.integration - spring-integration-xmpp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -84,17 +84,17 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-xmpp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/build.gradle b/build.gradle index 371cb19dd..06bb48019 100644 --- a/build.gradle +++ b/build.gradle @@ -61,24 +61,24 @@ subprojects { subproject -> developer { id = 'garyrussell' name = 'Gary Russell' - email = 'grussell@gopivotal.com' + email = 'grussell@pivotal.io' roles = ["project lead"] } developer { id = 'markfisher' name = 'Mark Fisher' - email = 'mfisher@gopivotal.com' + email = 'mfisher@pivotal.io' roles = ["project founder and lead emeritus"] } developer { id = 'ghillert' name = 'Gunnar Hillert' - email = 'ghillert@gopivotal.com' + email = 'ghillert@pivotal.io' } developer { id = 'abilan' name = 'Artem Bilan' - email = 'abilan@gopivotal.com' + email = 'abilan@pivotal.io' } } @@ -139,6 +139,7 @@ subprojects { subproject -> repositories { //TODO on release +// 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' } @@ -192,7 +193,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.6' springIntegrationVersion = '4.0.4.RELEASE' - springIntegration41Version = '4.1.0.M1' + springIntegration41Version = '4.1.0.BUILD-SNAPSHOT' springIntegrationDslVersion = '1.0.0.M3' springVersion = '4.0.7.RELEASE' springSecurityVersion = '3.2.4.RELEASE' @@ -535,6 +536,9 @@ project('si4demo') { mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' + tasks.withType(JavaExec) { + standardInput = System.in + } } project('cafe-dsl') { @@ -547,6 +551,7 @@ project('cafe-dsl') { dependencies { compile project(":cafe-si") compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core:$springIntegration41Version" compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -1093,6 +1098,25 @@ project('tx-synch') { } } +project('web-sockets') { + description = 'Web Sockets Basic Sample' + + apply plugin: 'spring-boot' + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-websocket' + compile "org.springframework.integration:spring-integration-websocket:$springIntegration41Version" + + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + + mainClassName = 'org.springframework.integration.samples.websocket.standard.server.Application' + + tasks.withType(JavaExec) { + standardInput = System.in + } +} + task wrapper(type: Wrapper) { description = 'Generates gradlew[.bat] scripts' gradleVersion = '1.12' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml new file mode 100644 index 000000000..2ac49afeb --- /dev/null +++ b/dsl/cafe-dsl/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + + spring-boot-starter-parent + org.springframework.boot + 1.1.6.RELEASE + + org.springframework.integration.samples + cafe-dsl + 3.0.0.BUILD-SNAPSHOT + Java DSL Cafe Sample + Java DSL Cafe 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-maven-plugin + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-java-dsl + 1.0.0.M3 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java index 55aed541c..cf2c7b000 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java @@ -26,6 +26,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; @@ -98,6 +99,7 @@ public IntegrationFlow ordersFlow() { } @Bean + @DependsOn("preparedDrinksFlow") public IntegrationFlow coldDrinksFlow() { return IntegrationFlows.from(MessageChannels.queue("coldDrinks", 10)) .handle((orderItem, h) -> { @@ -119,6 +121,7 @@ public IntegrationFlow coldDrinksFlow() { } @Bean + @DependsOn("preparedDrinksFlow") public IntegrationFlow hotDrinksFlow() { return IntegrationFlows.from(MessageChannels.queue("hotDrinks", 10)) .handle((orderItem, h) -> { diff --git a/dsl/pom.xml b/dsl/pom.xml new file mode 100644 index 000000000..3e132bfee --- /dev/null +++ b/dsl/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + org.springframework.integration.samples + dsl + 3.0.0.BUILD-SNAPSHOT + 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 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml new file mode 100644 index 000000000..f272e313f --- /dev/null +++ b/dsl/si4demo/pom.xml @@ -0,0 +1,134 @@ + + + 4.0.0 + + spring-boot-starter-parent + org.springframework.boot + 1.1.6.RELEASE + + org.springframework.integration.samples + si4demo + 3.0.0.BUILD-SNAPSHOT + Java Configuration/DSL Sample + Java Configuration/DSL 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-maven-plugin + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.boot + spring-boot-starter-web + compile + + + org.springframework.integration + spring-integration-java-dsl + 1.0.0.M3 + compile + + + org.springframework.integration + spring-integration-twitter + 4.0.4.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b4ec04cfd..6665dabfd 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Async Gateway Sample Async Gateway Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.projectreactor.spring + reactor-spring-context + 1.1.3.RELEASE + compile + junit junit @@ -72,10 +78,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.1.0.BUILD-SNAPSHOT compile @@ -90,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 4de41cfff..fb8e090eb 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Dynamic Poller Sample Dynamic Poller Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 8969441ee..b407acffd 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Error Handling Sample Error Handling Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index ffff23892..444f637ad 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT File Processing Sample File Processing Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,18 @@ 1.3 test + + org.springframework.integration + spring-integration-file + 4.0.4.RELEASE + compile + + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -84,17 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile - diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index f8d84c97c..f4983767c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Mail Attachment Sample Mail Attachment Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,24 @@ 1.3 test + + org.springframework.integration + spring-integration-mail + 4.0.4.RELEASE + compile + + + org.springframework.integration + spring-integration-file + 4.0.4.RELEASE + compile + + + org.springframework + spring-test + 4.0.7.RELEASE + test + commons-io commons-io @@ -87,15 +105,9 @@ org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test - - org.springframework.integration - spring-integration-mail - 4.0.0.RELEASE - compile - log4j log4j @@ -120,17 +132,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile - diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 2106d8d44..3496fb5a9 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war Monitoring Application Monitoring Application @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -75,10 +75,16 @@ + + org.springframework.integration + spring-integration-groovy + 4.0.4.RELEASE + compile + org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -100,15 +106,15 @@ test - org.springframework.integration - spring-integration-jmx - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test org.springframework.integration spring-integration-twitter - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -117,12 +123,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-groovy - 4.0.0.RELEASE - compile - org.mockito mockito-core @@ -130,10 +130,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-jmx + 4.0.4.RELEASE + compile diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 877ffa44f..065150b04 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war HTTP Multipart Demo HTTP Multipart Demo @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,7 +78,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -94,10 +94,10 @@ test - org.springframework.integration - spring-integration-http - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test commons-io @@ -105,6 +105,12 @@ 2.4 compile + + org.springframework.integration + spring-integration-http + 4.0.4.RELEASE + compile + log4j log4j @@ -129,11 +135,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 5a6d807e3..b1c8555ff 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index afdeb9c41..45b8a4e87 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -77,14 +77,8 @@ org.springframework - spring-context - 4.0.3.RELEASE - compile - - - org.springframework - spring-webmvc - 4.0.3.RELEASE + spring-oxm + 4.0.7.RELEASE compile @@ -93,28 +87,46 @@ 4.11 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-http - 4.0.0.RELEASE + 4.0.4.RELEASE + compile + + + org.springframework.security + spring-security-web + 3.2.4.RELEASE compile org.springframework - spring-jdbc - 4.0.3.RELEASE + spring-context + 4.0.7.RELEASE compile - org.springframework.security - spring-security-web - 3.2.3.RELEASE + org.springframework + spring-aop + 4.0.7.RELEASE compile org.springframework - spring-oxm - 4.0.3.RELEASE + spring-webmvc + 4.0.7.RELEASE + compile + + + org.springframework.security + spring-security-config + 3.2.4.RELEASE compile @@ -132,19 +144,7 @@ org.springframework spring-tx - 4.0.3.RELEASE - compile - - - org.springframework - spring-aop - 4.0.3.RELEASE - compile - - - org.springframework.security - spring-security-config - 3.2.3.RELEASE + 4.0.7.RELEASE compile @@ -167,9 +167,9 @@ org.springframework - spring-test - 4.0.3.RELEASE - test + spring-jdbc + 4.0.7.RELEASE + compile diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d78a2b016..ad0430a8b 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Retry and More Sample Retry and More Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,18 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - - - org.springframework.integration - spring-integration-ftp - 4.0.0.RELEASE - compile - junit junit @@ -86,10 +74,16 @@ org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE + spring-integration-file + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -97,21 +91,27 @@ compile - org.mockito - mockito-core - 1.9.5 + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE compile - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-amqp + 4.0.4.RELEASE + compile org.springframework.integration - spring-integration-file - 4.0.0.RELEASE + spring-integration-ftp + 4.0.4.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 compile diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index fbd7e1b47..771fb202f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,12 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + javax.inject javax.inject @@ -81,7 +87,7 @@ org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 45b8dce0d..681dfa968 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Derby Stored Procedures Sample Derby Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + junit junit @@ -79,10 +85,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 506bb3cc3..8e13b9b34 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + c3p0 c3p0 @@ -85,10 +91,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -102,11 +108,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 851da6ce2..bfd8c4c3e 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Oracle Stored Procedures Sample Oracle Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + junit junit @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -84,23 +90,11 @@ 1.2.17 compile - - com.oracle - ojdbc6 - 11.2.0.3 - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index f4ac1d38e..fff719012 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + junit junit @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test commons-pool @@ -102,12 +108,6 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - postgresql postgresql diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 052fabd77..e4d45831d 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + junit junit @@ -72,10 +78,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test @@ -84,23 +96,11 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index ed6e1d08c..415313dad 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples travel - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Travel Services Sample Travel Services Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -73,15 +73,21 @@ test - org.springframework.integration - spring-integration-http - 4.0.0.RELEASE + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework + spring-web + 4.0.7.RELEASE compile org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE + spring-integration-http + 4.0.4.RELEASE compile @@ -90,12 +96,6 @@ 1.2.17 compile - - org.springframework - spring-web - 4.0.3.RELEASE - compile - org.mockito mockito-core @@ -103,10 +103,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-ws + 4.0.4.RELEASE + compile diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 2726ed1d4..20aa90473 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Transaction Synchronization Sample Transaction Synchronization Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + com.h2database h2 @@ -80,10 +86,16 @@ org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE + spring-integration-file + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -96,17 +108,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile -