diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index baa05c9a..007f45ff 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -60,18 +60,6 @@ - - org.springframework.integration - spring-integration-groovy - 4.0.4.RELEASE - compile - - - org.springframework.integration - spring-integration-jms - 4.0.4.RELEASE - compile - junit junit @@ -84,24 +72,36 @@ 1.3 test - - org.springframework - spring-test - 4.0.7.RELEASE - test - javax.jms jms-api 1.1-rev-1 compile + + org.springframework + spring-test + 4.1.1.RELEASE + test + + + org.springframework.integration + spring-integration-jms + 4.1.0.RC1 + compile + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-groovy + 4.1.0.RC1 + compile + org.mockito mockito-core diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index a921b5ce..23412ee7 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -72,10 +72,16 @@ 1.3 test + + org.springframework.integration + spring-integration-ftp + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,12 +90,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-ftp - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 5c3d96f2..af6ff003 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -60,18 +60,6 @@ - - org.springframework.integration - spring-integration-groovy - 4.0.4.RELEASE - compile - - - org.springframework.integration - spring-integration-rmi - 4.0.4.RELEASE - compile - junit junit @@ -85,10 +73,10 @@ test - org.springframework - spring-test - 4.0.7.RELEASE - test + org.springframework.integration + spring-integration-jmx + 4.1.0.RC1 + compile org.codehaus.groovy @@ -96,6 +84,18 @@ 2.3.0 compile + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + + + org.springframework + spring-test + 4.1.1.RELEASE + test + org.python jython-standalone @@ -110,8 +110,14 @@ org.springframework.integration - spring-integration-stream - 4.0.4.RELEASE + spring-integration-groovy + 4.1.0.RC1 + compile + + + org.springframework.integration + spring-integration-rmi + 4.1.0.RC1 compile @@ -126,11 +132,5 @@ 1.9.5 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 385b49cf..eefeedba 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -61,9 +61,9 @@ - org.springframework.integration.samples - cafe-si - 3.0.0.BUILD-SNAPSHOT + org.springframework.integration + spring-integration-amqp + 4.1.0.RC1 compile @@ -78,10 +78,16 @@ 1.3 test + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -90,12 +96,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-amqp - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index e32d1897..7d10dc36 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -60,18 +60,6 @@ - - org.springframework.integration.samples - cafe-si - 3.0.0.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-jms - 4.0.4.RELEASE - compile - junit junit @@ -84,12 +72,24 @@ 1.3 test + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-jms + 4.1.0.RC1 + compile + log4j log4j diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 59e73388..63507111 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -72,10 +72,16 @@ 1.3 test + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,12 +90,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-stream - 4.0.4.RELEASE - compile - com.fasterxml.jackson.core jackson-databind diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index d653118e..59361415 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-ip - 4.0.4.RELEASE - compile - junit junit @@ -81,9 +75,15 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-ip + 4.1.0.RC1 + compile + log4j log4j diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 4e44479b..d0dae29d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -93,48 +93,60 @@ 4.11 test + + org.springframework + spring-aop + 4.1.1.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.1.RELEASE + compile + + + org.springframework + spring-aspects + 4.1.1.RELEASE + compile + commons-fileupload commons-fileupload 1.2.2 compile - - org.springframework - spring-aop - 4.0.7.RELEASE - compile - - - org.springframework - spring-context - 4.0.7.RELEASE - compile - org.aspectj aspectjtools 1.8.0 compile - - org.springframework - spring-webmvc - 4.0.7.RELEASE - compile - org.hibernate hibernate-entitymanager 4.2.11.Final compile + + org.springframework + spring-orm + 4.1.1.RELEASE + compile + commons-pool commons-pool 1.5.4 compile + + org.springframework + spring-jdbc + 4.1.1.RELEASE + compile + javax.validation validation-api @@ -179,14 +191,8 @@ org.springframework - spring-jdbc - 4.0.7.RELEASE - compile - - - org.springframework.integration - spring-integration-ip - 4.0.4.RELEASE + spring-context + 4.1.1.RELEASE compile @@ -195,24 +201,6 @@ 1.7.6 compile - - 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 - org.apache.tiles tiles-jsp @@ -233,8 +221,14 @@ org.springframework - spring-tx - 4.0.7.RELEASE + spring-test + 4.1.1.RELEASE + test + + + org.springframework.integration + spring-integration-ip + 4.1.0.RC1 compile @@ -249,6 +243,12 @@ 2.0.0 compile + + org.springframework + spring-tx + 4.1.1.RELEASE + compile + org.mockito mockito-core diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml new file mode 100644 index 00000000..aa6a837a --- /dev/null +++ b/applications/stomp-chat/pom.xml @@ -0,0 +1,132 @@ + + + 4.0.0 + + spring-boot-starter-parent + org.springframework.boot + 1.2.0.BUILD-SNAPSHOT + + org.springframework.integration.samples + stomp-chat + 3.0.0.BUILD-SNAPSHOT + Web Sockets Stomp Chat Sample + Web Sockets Stomp Chat 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 + spring-integration-event + compile + + + org.springframework.boot + spring-boot-starter-websocket + compile + + + org.springframework.integration + spring-integration-groovy + compile + + + junit + junit + 4.11 + test + + + org.springframework.integration + spring-integration-websocket + compile + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework + spring-test + 4.1.1.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index e45bd308..c2a2fcc3 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-amqp + 4.1.0.RC1 + compile + junit junit @@ -72,10 +78,16 @@ 1.3 test + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,18 +96,6 @@ 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 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index f400d540..c6d865c1 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-core + 4.1.0.RC1 + compile + junit junit @@ -75,15 +81,9 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test - - org.springframework.integration - spring-integration-core - 4.0.4.RELEASE - compile - log4j log4j diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index aab6903b..940dd963 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-core + 4.1.0.RC1 + compile + com.h2database h2 @@ -81,15 +87,9 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test - - org.springframework.integration - spring-integration-core - 4.0.4.RELEASE - compile - log4j log4j diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 21d72a6e..885ec010 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -72,10 +72,16 @@ 1.3 test + + org.springframework.integration + spring-integration-feed + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,12 +90,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-feed - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 353d5fef..e6b96df3 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -75,13 +75,13 @@ org.springframework.integration spring-integration-file - 4.0.4.RELEASE + 4.1.0.RC1 compile org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 915b5f49..f37648ce 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-test + 4.1.0.RC1 + test + org.slf4j slf4j-log4j12 @@ -79,10 +85,10 @@ test - org.springframework - spring-test - 4.0.7.RELEASE - test + org.springframework.integration + spring-integration-ftp + 4.1.0.RC1 + compile commons-io @@ -97,9 +103,9 @@ compile - org.springframework.integration - spring-integration-test - 4.0.4.RELEASE + org.springframework + spring-test + 4.1.1.RELEASE test @@ -108,12 +114,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-ftp - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 2e4b9db8..2594b0e6 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-core + 4.1.0.RC1 + compile + junit junit @@ -75,15 +81,9 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test - - org.springframework.integration - spring-integration-core - 4.0.4.RELEASE - compile - log4j log4j diff --git a/basic/http/pom.xml b/basic/http/pom.xml index ca36903e..d3e06aac 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -76,9 +76,9 @@ - org.springframework - spring-webmvc - 4.0.7.RELEASE + org.springframework.integration + spring-integration-mail + 4.1.0.RC1 compile @@ -93,17 +93,11 @@ 1.3 test - - org.springframework.integration - spring-integration-mail - 4.0.4.RELEASE - compile - org.springframework - spring-test - 4.0.7.RELEASE - test + spring-webmvc + 4.1.1.RELEASE + compile commons-io @@ -112,10 +106,10 @@ compile - org.springframework.integration - spring-integration-http - 4.0.4.RELEASE - compile + org.springframework + spring-test + 4.1.1.RELEASE + test log4j @@ -123,6 +117,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.1.0.RC1 + compile + javax.mail javax.mail-api diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index c4f3578c..b9638ebe 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-jdbc - 4.0.4.RELEASE - compile - com.h2database h2 @@ -87,9 +81,15 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-jdbc + 4.1.0.RC1 + compile + log4j log4j diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index fd15f588..1b28cfc1 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -60,18 +60,18 @@ + + org.springframework.integration + spring-integration-test + 4.1.0.RC1 + test + org.slf4j slf4j-log4j12 1.7.6 compile - - org.springframework.integration - spring-integration-jms - 4.0.4.RELEASE - compile - junit junit @@ -84,17 +84,23 @@ 1.3 test + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test org.springframework.integration - spring-integration-test - 4.0.4.RELEASE - test + spring-integration-jms + 4.1.0.RC1 + compile log4j @@ -102,12 +108,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-stream - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index dbe761e3..88c953f2 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -72,10 +72,22 @@ 1.3 test + + org.springframework.integration + spring-integration-jmx + 4.1.0.RC1 + compile + + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,23 +96,11 @@ 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.integration - spring-integration-jmx - 4.0.4.RELEASE - compile - diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 1c1ea329..18fe8c6f 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -90,29 +90,17 @@ 1.3 test - - org.springframework - spring-test - 4.0.7.RELEASE - test - org.apache.openjpa openjpa 2.3.0 runtime - - org.springframework.integration - spring-integration-jpa - 4.0.4.RELEASE - compile - org.springframework - spring-instrument - 4.0.7.RELEASE - runtime + spring-test + 4.1.1.RELEASE + test org.eclipse.persistence @@ -126,11 +114,23 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-jpa + 4.1.0.RC1 + compile + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-instrument + 4.1.1.RELEASE + runtime + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index e372611c..b8a94a03 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -60,6 +60,18 @@ + + org.springframework.integration + spring-integration-mail + 4.1.0.RC1 + compile + + + org.springframework + spring-context + 4.1.1.RELEASE + compile + junit junit @@ -72,16 +84,10 @@ 1.3 test - - org.springframework.integration - spring-integration-mail - 4.0.4.RELEASE - compile - org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -102,12 +108,6 @@ 1.4.7 compile - - org.springframework - spring-context - 4.0.7.RELEASE - compile - org.mockito mockito-core diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 4919ab87..1e59d607 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-mongodb - 4.0.4.RELEASE - compile - junit junit @@ -78,10 +72,16 @@ 1.3 test + + org.springframework.integration + spring-integration-mongodb + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index ed19b258..8c9864c8 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-core + 4.1.0.RC1 + compile + junit junit @@ -75,15 +81,9 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test - - org.springframework.integration - spring-integration-core - 4.0.4.RELEASE - compile - log4j log4j diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index c50612da..c59d0ce4 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -72,10 +72,16 @@ 1.3 test + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,12 +90,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-stream - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index df3d5930..f0f6bde0 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -66,12 +66,6 @@ 4.11 test - - org.springframework.integration - spring-integration-sftp - 4.0.4.RELEASE - compile - org.hamcrest hamcrest-all @@ -81,7 +75,7 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -96,6 +90,12 @@ 1.9.5 test + + org.springframework.integration + spring-integration-sftp + 4.1.0.RC1 + compile + org.apache.sshd sshd-core diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 71835ef5..32fbbd71 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -62,8 +62,8 @@ org.springframework.integration - spring-integration-ip - 4.0.4.RELEASE + spring-integration-amqp + 4.1.0.RC1 compile @@ -87,21 +87,21 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-ip + 4.1.0.RC1 + compile + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-amqp - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 7a0425ac..b14ace59 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -62,8 +62,8 @@ org.springframework.integration - spring-integration-ip - 4.0.4.RELEASE + spring-integration-test + 4.1.0.RC1 compile @@ -87,13 +87,13 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test org.springframework.integration - spring-integration-test - 4.0.4.RELEASE + spring-integration-ip + 4.1.0.RC1 compile diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 88311389..e9fb40df 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -61,11 +61,17 @@ - org.springframework - spring-webmvc - 4.0.7.RELEASE + org.springframework.integration + spring-integration-ws + 4.1.0.RC1 compile + + org.springframework.integration + spring-integration-test + 4.1.0.RC1 + test + junit junit @@ -78,28 +84,22 @@ 1.3 test + + org.springframework + spring-webmvc + 4.1.1.RELEASE + compile + org.springframework.integration spring-integration-file - 4.0.4.RELEASE + 4.1.0.RC1 compile org.springframework spring-test - 4.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-http - 4.0.4.RELEASE - compile - - - org.springframework.integration - spring-integration-test - 4.0.4.RELEASE + 4.1.1.RELEASE test @@ -108,17 +108,17 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.1.0.RC1 + compile + org.mockito mockito-core 1.9.5 test - - org.springframework.integration - spring-integration-ws - 4.0.4.RELEASE - compile - diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index f3fdf022..0051fc5d 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -72,18 +72,18 @@ 1.3 test - - org.springframework - spring-test - 4.0.7.RELEASE - test - org.springframework.integration spring-integration-twitter - 4.0.4.RELEASE + 4.1.0.RC1 compile + + org.springframework + spring-test + 4.1.1.RELEASE + test + log4j log4j diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index fbfc884d..f37997b2 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -5,7 +5,7 @@ spring-boot-starter-parent org.springframework.boot - 1.1.6.RELEASE + 1.2.0.BUILD-SNAPSHOT org.springframework.integration.samples web-sockets @@ -84,6 +84,11 @@ 4.11 test + + org.springframework.integration + spring-integration-websocket + compile + org.hamcrest hamcrest-all @@ -91,14 +96,14 @@ test - org.springframework - spring-test - 4.0.7.RELEASE + org.springframework.boot + spring-boot-starter-test test - org.springframework.boot - spring-boot-starter-test + org.springframework + spring-test + 4.1.1.RELEASE test @@ -113,11 +118,5 @@ 1.9.5 test - - org.springframework.integration - spring-integration-websocket - 4.1.0.BUILD-SNAPSHOT - compile - diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index bb60ba1e..a800004d 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -76,9 +76,9 @@ - org.springframework - spring-webmvc - 4.0.7.RELEASE + org.springframework.integration + spring-integration-ws + 4.1.0.RC1 compile @@ -93,16 +93,22 @@ 1.3 test + + org.springframework + spring-webmvc + 4.1.1.RELEASE + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test org.springframework.integration spring-integration-xml - 4.0.4.RELEASE + 4.1.0.RC1 compile @@ -117,11 +123,5 @@ 1.9.5 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 09e44aa5..d158d3f0 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ws + 4.1.0.RC1 + compile + junit junit @@ -72,10 +78,16 @@ 1.3 test + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,23 +96,11 @@ 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.integration - spring-integration-ws - 4.0.4.RELEASE - compile - diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 77508a17..f0bac5d2 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -75,13 +75,13 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test org.springframework.integration spring-integration-xml - 4.0.4.RELEASE + 4.1.0.RC1 compile diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 18643357..9a325919 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-xmpp + 4.1.0.RC1 + compile + junit junit @@ -75,7 +81,7 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,12 +90,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-xmpp - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/build.gradle b/build.gradle index 68c48c7d..0810d466 100644 --- a/build.gradle +++ b/build.gradle @@ -193,7 +193,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.6' springIntegrationVersion = '4.1.0.RC1' - springIntegrationDslVersion = '1.0.0.M3' + springIntegrationDslVersion = '1.0.0.RC1' springVersion = '4.1.1.RELEASE' springSecurityVersion = '3.2.4.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 2ac49afe..867ae41a 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -5,7 +5,7 @@ spring-boot-starter-parent org.springframework.boot - 1.1.6.RELEASE + 1.2.0.BUILD-SNAPSHOT org.springframework.integration.samples cafe-dsl @@ -73,12 +73,6 @@ - - org.springframework.integration.samples - cafe-si - 3.0.0.BUILD-SNAPSHOT - compile - junit junit @@ -91,12 +85,6 @@ 1.3 test - - org.springframework - spring-test - 4.0.7.RELEASE - test - org.springframework.boot spring-boot-starter-test @@ -110,9 +98,21 @@ org.springframework.integration spring-integration-java-dsl - 1.0.0.M3 + 1.0.0.RC1 compile + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + + + org.springframework + spring-test + 4.1.1.RELEASE + test + log4j log4j @@ -125,5 +125,10 @@ 1.9.5 test + + org.springframework.integration + spring-integration-core + compile + 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 cf2c7b00..5ef91ea4 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 @@ -33,7 +33,7 @@ import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.channel.MessageChannels; -import org.springframework.integration.dsl.support.Pollers; +import org.springframework.integration.dsl.core.Pollers; import org.springframework.integration.samples.cafe.Delivery; import org.springframework.integration.samples.cafe.Drink; import org.springframework.integration.samples.cafe.DrinkType; diff --git a/dsl/pom.xml b/dsl/pom.xml index 3e132bfe..213b40c0 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -73,7 +73,7 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index f272e313..62247e40 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -5,7 +5,7 @@ spring-boot-starter-parent org.springframework.boot - 1.1.6.RELEASE + 1.2.0.BUILD-SNAPSHOT org.springframework.integration.samples si4demo @@ -79,18 +79,35 @@ 4.11 test + + com.sun.mail + pop3 + 1.4.7 + compile + + + org.springframework.boot + spring-boot-starter-web + compile + + + com.rometools + rome + 1.5.0 + compile + + + com.sun.mail + imap + 1.4.7 + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.0.7.RELEASE - test - org.springframework.boot spring-boot-starter-test @@ -101,29 +118,52 @@ spring-boot-starter-integration compile - - org.springframework.boot - spring-boot-starter-web - compile - org.springframework.integration spring-integration-java-dsl - 1.0.0.M3 + 1.0.0.RC1 compile - org.springframework.integration - spring-integration-twitter - 4.0.4.RELEASE + com.sun.mail + javax.mail + 1.4.7 compile + + org.springframework + spring-test + 4.1.1.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-mail + compile + + + javax.mail + javax.mail-api + 1.4.7 + compile + + + com.sun.mail + smtp + 1.4.7 + compile + + + org.springframework.integration + spring-integration-twitter + compile + org.mockito mockito-core diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b979729d..0087cd3b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d68fee2c..8bdb8f06 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 17 15:51:10 EEST 2014 +#Fri Oct 31 21:11:10 EET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 6665dabf..c39e473e 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-core + 4.1.0.RC1 + compile + org.projectreactor.spring reactor-spring-context @@ -81,15 +87,9 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test - - org.springframework.integration - spring-integration-core - 4.1.0.BUILD-SNAPSHOT - compile - log4j log4j diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index fb8e090e..98bb2be2 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-core + 4.1.0.RC1 + compile + junit junit @@ -75,15 +81,9 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test - - org.springframework.integration - spring-integration-core - 4.0.4.RELEASE - compile - log4j log4j diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index b407acff..dc2b8982 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -72,10 +72,16 @@ 1.3 test + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -84,12 +90,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-stream - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 444f637a..469a94ca 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -75,13 +75,13 @@ org.springframework.integration spring-integration-file - 4.0.4.RELEASE + 4.1.0.RC1 compile org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index f4983767..82804dc3 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -60,6 +60,18 @@ + + org.springframework.integration + spring-integration-mail + 4.1.0.RC1 + compile + + + org.springframework.integration + spring-integration-test + 4.1.0.RC1 + test + junit junit @@ -72,24 +84,6 @@ 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 @@ -104,8 +98,14 @@ org.springframework.integration - spring-integration-test - 4.0.4.RELEASE + spring-integration-file + 4.1.0.RC1 + compile + + + org.springframework + spring-test + 4.1.1.RELEASE test diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 3496fb5a..352e7574 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -75,18 +75,6 @@ - - org.springframework.integration - spring-integration-groovy - 4.0.4.RELEASE - compile - - - org.springframework - spring-webmvc - 4.0.7.RELEASE - compile - javax.servlet jstl @@ -105,35 +93,47 @@ 1.3 test + + org.springframework.integration + spring-integration-jmx + 4.1.0.RC1 + compile + org.springframework - spring-test - 4.0.7.RELEASE - test + spring-webmvc + 4.1.1.RELEASE + compile org.springframework.integration spring-integration-twitter - 4.0.4.RELEASE + 4.1.0.RC1 compile + + org.springframework + spring-test + 4.1.1.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-groovy + 4.1.0.RC1 + compile + org.mockito mockito-core 1.9.5 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 065150b0..c0f88b53 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -75,12 +75,6 @@ - - org.springframework - spring-webmvc - 4.0.7.RELEASE - compile - junit junit @@ -95,9 +89,9 @@ org.springframework - spring-test - 4.0.7.RELEASE - test + spring-webmvc + 4.1.1.RELEASE + compile commons-io @@ -106,10 +100,10 @@ compile - org.springframework.integration - spring-integration-http - 4.0.4.RELEASE - compile + org.springframework + spring-test + 4.1.1.RELEASE + test log4j @@ -117,6 +111,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.1.0.RC1 + compile + commons-fileupload commons-fileupload diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 45b8a4e8..5d2993ea 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -77,8 +77,8 @@ org.springframework - spring-oxm - 4.0.7.RELEASE + spring-context + 4.1.1.RELEASE compile @@ -89,14 +89,14 @@ org.springframework - spring-test - 4.0.7.RELEASE - test + spring-aop + 4.1.1.RELEASE + compile - org.springframework.integration - spring-integration-http - 4.0.4.RELEASE + org.springframework + spring-webmvc + 4.1.1.RELEASE compile @@ -105,24 +105,6 @@ 3.2.4.RELEASE compile - - org.springframework - spring-context - 4.0.7.RELEASE - compile - - - org.springframework - spring-aop - 4.0.7.RELEASE - compile - - - org.springframework - spring-webmvc - 4.0.7.RELEASE - compile - org.springframework.security spring-security-config @@ -135,6 +117,12 @@ 1.3 test + + org.springframework + spring-oxm + 4.1.1.RELEASE + compile + org.jasypt jasypt @@ -143,16 +131,34 @@ org.springframework - spring-tx - 4.0.7.RELEASE + spring-jdbc + 4.1.1.RELEASE compile + + org.springframework + spring-test + 4.1.1.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.1.0.RC1 + compile + + + org.springframework + spring-tx + 4.1.1.RELEASE + compile + com.fasterxml.jackson.core jackson-databind @@ -165,11 +171,5 @@ 1.9.5 test - - org.springframework - spring-jdbc - 4.0.7.RELEASE - compile - diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index ad0430a8..a1c70e3a 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-amqp + 4.1.0.RC1 + compile + junit junit @@ -72,16 +78,28 @@ 1.3 compile + + org.springframework.integration + spring-integration-ftp + 4.1.0.RC1 + compile + + + org.springframework.integration + spring-integration-stream + 4.1.0.RC1 + compile + org.springframework.integration spring-integration-file - 4.0.4.RELEASE + 4.1.0.RC1 compile org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test @@ -90,24 +108,6 @@ 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.springframework.integration - spring-integration-ftp - 4.0.4.RELEASE - compile - org.mockito mockito-core diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 771fb202..74c36fbc 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-core + 4.1.0.RC1 + compile + junit junit @@ -72,12 +78,6 @@ 1.3 test - - org.springframework - spring-test - 4.0.7.RELEASE - test - javax.inject javax.inject @@ -85,10 +85,10 @@ compile - org.springframework.integration - spring-integration-core - 4.0.4.RELEASE - compile + org.springframework + spring-test + 4.1.1.RELEASE + test log4j diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 681dfa96..37d6410e 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-jdbc - 4.0.4.RELEASE - compile - junit junit @@ -87,9 +81,15 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-jdbc + 4.1.0.RC1 + compile + log4j log4j diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 8e13b9b3..650a3793 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-jdbc - 4.0.4.RELEASE - compile - c3p0 c3p0 @@ -93,9 +87,15 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-jdbc + 4.1.0.RC1 + compile + log4j log4j diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index bfd8c4c3..113adc52 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-jdbc - 4.0.4.RELEASE - compile - junit junit @@ -81,9 +75,15 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-jdbc + 4.1.0.RC1 + compile + log4j log4j diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index fff71901..2213a217 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-jdbc - 4.0.4.RELEASE - compile - junit junit @@ -78,18 +72,24 @@ 1.3 test - - org.springframework - spring-test - 4.0.7.RELEASE - test - commons-pool commons-pool 1.5.4 compile + + org.springframework + spring-test + 4.1.1.RELEASE + test + + + org.springframework.integration + spring-integration-jdbc + 4.1.0.RC1 + compile + commons-dbcp commons-dbcp diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index e4d45831..cc376514 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -62,9 +62,9 @@ org.springframework.integration - spring-integration-ip - 4.0.4.RELEASE - compile + spring-integration-test + 4.1.0.RC1 + test junit @@ -81,14 +81,14 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test org.springframework.integration - spring-integration-test - 4.0.4.RELEASE - test + spring-integration-ip + 4.1.0.RC1 + compile log4j diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 415313da..be6a0673 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -60,6 +60,18 @@ + + org.springframework.integration + spring-integration-ws + 4.1.0.RC1 + compile + + + org.springframework + spring-web + 4.1.1.RELEASE + compile + junit junit @@ -75,38 +87,26 @@ org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test - - org.springframework - spring-web - 4.0.7.RELEASE - compile - - - org.springframework.integration - spring-integration-http - 4.0.4.RELEASE - compile - log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.1.0.RC1 + compile + org.mockito mockito-core 1.9.5 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 20aa9047..ee06520d 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-jdbc - 4.0.4.RELEASE - compile - com.h2database h2 @@ -87,15 +81,21 @@ org.springframework.integration spring-integration-file - 4.0.4.RELEASE + 4.1.0.RC1 compile org.springframework spring-test - 4.0.7.RELEASE + 4.1.1.RELEASE test + + org.springframework.integration + spring-integration-jdbc + 4.1.0.RC1 + compile + log4j log4j