diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 7bf07b63..2c365409 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -53,24 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - - - org.springframework.integration - spring-integration-jms - 4.3.0.RC1 - compile - - - org.hamcrest - hamcrest-all - 1.3 - test - javax.jms jms-api @@ -79,15 +61,15 @@ org.springframework.integration - spring-integration-groovy - 4.3.0.RC1 + spring-integration-jms + 4.3.0.RELEASE compile - org.springframework - spring-test - 4.3.0.RC2 - test + org.springframework.integration + spring-integration-groovy + 4.3.0.RELEASE + compile log4j @@ -95,12 +77,30 @@ 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 67188d66..f0f29d99 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -53,42 +53,42 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - org.springframework.integration spring-integration-ftp - 4.3.0.RC1 + 4.3.0.RELEASE compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 46fdce42..9982c939 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -56,7 +56,49 @@ org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-groovy + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-rmi + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-jmx + 4.3.0.RELEASE + compile + + + org.jruby + jruby + 1.7.12 + compile + + + org.python + jython-standalone + 2.5.3 + compile + + + org.codehaus.groovy + groovy-all + 2.3.0 + compile + + + log4j + log4j + 1.2.17 compile @@ -71,48 +113,6 @@ 1.3 test - - org.codehaus.groovy - groovy-all - 2.3.0 - compile - - - org.springframework.integration - spring-integration-jmx - 4.3.0.RC1 - compile - - - org.springframework.integration - spring-integration-groovy - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.python - jython-standalone - 2.5.3 - compile - - - log4j - log4j - 1.2.17 - compile - - - org.jruby - jruby - 1.7.12 - compile - org.mockito mockito-core @@ -120,10 +120,10 @@ test - org.springframework.integration - spring-integration-rmi - 4.3.0.RC1 - compile + org.springframework + spring-test + 4.3.0.RELEASE + test diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 21959bfc..82175b44 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -53,6 +53,24 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration.samples + cafe-si + 4.3.0.BUILD-SNAPSHOT + compile + + + org.springframework.integration + spring-integration-amqp + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,33 +84,15 @@ test - org.springframework.integration - spring-integration-amqp - 4.3.0.RC1 - compile - - - org.springframework.integration.samples - cafe-si - 4.3.0.BUILD-SNAPSHOT - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index e0fdcbda..00cc4903 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -54,23 +54,11 @@ - junit - junit - 4.12 - test - - - org.springframework.integration - spring-integration-jms - 4.3.0.RC1 + org.springframework.integration.samples + cafe-si + 4.3.0.BUILD-SNAPSHOT compile - - org.hamcrest - hamcrest-all - 1.3 - test - org.apache.activemq activemq-broker @@ -84,29 +72,41 @@ compile - org.springframework.integration.samples - cafe-si - 4.3.0.BUILD-SNAPSHOT + org.springframework.integration + spring-integration-jms + 4.3.0.RELEASE compile - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 80853b4e..f0b704e8 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -56,7 +56,19 @@ org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + log4j + log4j + 1.2.17 compile @@ -71,30 +83,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 4fb45210..318dabcb 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ip + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,27 +78,15 @@ test - org.springframework.integration - spring-integration-ip - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index be046e91..8b851f7c 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -53,129 +53,33 @@ - org.springframework - spring-jdbc - 4.3.0.RC2 - compile - - - javax.transaction - jta - 1.1 - compile - - - junit - junit - 4.12 - test - - - org.slf4j - jcl-over-slf4j - 1.7.11 - runtime - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - commons-fileupload - commons-fileupload - 1.2.2 - compile - - - org.springframework - spring-tx - 4.3.0.RC2 - compile - - - org.slf4j - slf4j-api - 1.7.11 - compile - - - org.springframework - spring-orm - 4.3.0.RC2 - compile - - - commons-pool - commons-pool - 1.5.4 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - commons-dbcp - commons-dbcp - 1.2.2 - compile - - - joda-time - joda-time - 1.6 - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.springframework.webflow - spring-js - 2.3.3.RELEASE - compile - - - log4j - log4j - 1.2.17 - runtime - - - org.hsqldb - hsqldb - 2.3.2 - compile - - - org.slf4j - slf4j-log4j12 - 1.7.11 - runtime - - - org.springframework - spring-aop - 4.3.0.RC2 + org.springframework.integration + spring-integration-ip + 4.3.0.RELEASE compile org.springframework spring-webmvc - 4.3.0.RC2 + 4.3.0.RELEASE compile - org.springframework.integration - spring-integration-ip - 4.3.0.RC1 + org.springframework + spring-orm + 4.3.0.RELEASE + compile + + + org.springframework + spring-aop + 4.3.0.RELEASE + compile + + + org.springframework + spring-aspects + 4.3.0.RELEASE compile @@ -186,8 +90,44 @@ org.springframework - spring-aspects - 4.3.0.RC2 + spring-jdbc + 4.3.0.RELEASE + compile + + + org.springframework + spring-tx + 4.3.0.RELEASE + compile + + + org.springframework + spring-context + 4.3.0.RELEASE + compile + + + commons-fileupload + commons-fileupload + 1.2.2 + compile + + + commons-dbcp + commons-dbcp + 1.2.2 + compile + + + commons-digester + commons-digester + 2.0 + compile + + + commons-pool + commons-pool + 1.5.4 compile @@ -197,27 +137,21 @@ compile - org.hibernate - hibernate-entitymanager - 5.1.0.Final + joda-time + joda-time + 1.6 compile - org.hamcrest - hamcrest-all - 1.3 - test - - - commons-digester - commons-digester - 2.0 + javax.transaction + jta + 1.1 compile - org.springframework - spring-context - 4.3.0.RC2 + org.hsqldb + hsqldb + 2.3.2 compile @@ -226,18 +160,84 @@ 2.0 compile + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + org.eclipse.persistence javax.persistence 2.0.0 compile + + org.hibernate + hibernate-entitymanager + 5.0.9.Final + compile + + + org.springframework.webflow + spring-js + 2.3.3.RELEASE + compile + + + org.slf4j + slf4j-api + 1.7.11 + compile + + + log4j + log4j + 1.2.17 + runtime + + + org.slf4j + slf4j-log4j12 + 1.7.11 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.11 + runtime + + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c7e90208..04d39e87 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples stomp-chat @@ -57,32 +57,32 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.boot + spring-boot-starter-websocket + compile + + + org.springframework.integration + spring-integration-websocket + compile + org.springframework.integration spring-integration-event compile + + org.springframework.integration + spring-integration-groovy + compile + junit junit 4.12 test - - org.springframework.boot - spring-boot-starter-websocket - compile - - - org.springframework.integration - spring-integration-groovy - compile - - - org.springframework.integration - spring-integration-websocket - compile - org.hamcrest hamcrest-all @@ -90,20 +90,20 @@ test - org.springframework.boot - spring-boot-starter-test + org.mockito + mockito-core + 1.9.5 test org.springframework spring-test - 4.3.0.RC2 + 4.3.0.RELEASE test - org.mockito - mockito-core - 1.9.5 + org.springframework.boot + spring-boot-starter-test test diff --git a/basic/amqp-affinity/pom.xml b/basic/amqp-affinity/pom.xml index f7616f5a..12ffb7ce 100644 --- a/basic/amqp-affinity/pom.xml +++ b/basic/amqp-affinity/pom.xml @@ -63,18 +63,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 225b4eb2..1b2c4af8 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -56,7 +56,19 @@ org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-amqp + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -72,27 +84,15 @@ test - org.springframework.integration - spring-integration-amqp - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 3a6e6157..4fa10df5 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples barrier @@ -57,22 +57,10 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-all - 1.3 - test - org.springframework.boot - spring-boot-starter-test - test + spring-boot-starter-web + compile org.springframework.boot @@ -86,39 +74,51 @@ org.springframework.integration - spring-integration-amqp - 4.3.0.RC1 + spring-integration-core + 4.3.0.RELEASE compile - - org.springframework.boot - spring-boot-starter-web - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - org.springframework.integration - spring-integration-core - 4.3.0.RC1 + spring-integration-amqp + 4.3.0.RELEASE compile org.springframework.integration spring-integration-http - 4.3.0.RC1 + 4.3.0.RELEASE compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 37886b72..007f32a8 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -65,30 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 71498ee2..f8fccc68 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -54,10 +54,10 @@ - junit - junit - 4.12 - test + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile com.h2database @@ -65,36 +65,36 @@ 1.3.175 compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 4ac05bc2..25dba6f5 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-feed + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,27 +78,15 @@ test - org.springframework.integration - spring-integration-feed - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 4cd5478a..b00a06f6 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -53,42 +53,42 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - org.springframework.integration spring-integration-file - 4.3.0.RC1 + 4.3.0.RELEASE compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index a536543c..94eda82c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -53,52 +53,58 @@ https://github.com/spring-projects/spring-integration-samples - - org.slf4j - slf4j-api - 1.7.11 - compile - - - junit - junit - 4.12 - test - org.springframework.integration spring-integration-ftp - 4.3.0.RC1 + 4.3.0.RELEASE compile - - org.hamcrest - hamcrest-all - 1.3 - test - commons-io commons-io 2.4 compile - - org.springframework.integration - spring-integration-test - 4.3.0.RC1 - test - org.apache.ftpserver ftpserver-core 1.0.6 compile + + org.slf4j + slf4j-api + 1.7.11 + compile + + + org.slf4j + slf4j-log4j12 + 1.7.11 + runtime + + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.mockito + mockito-core + 1.9.5 + test + org.springframework spring-test - 4.3.0.RC2 + 4.3.0.RELEASE test @@ -108,15 +114,9 @@ test - org.slf4j - slf4j-log4j12 - 1.7.11 - runtime - - - org.mockito - mockito-core - 1.9.5 + org.springframework.integration + spring-integration-test + 4.3.0.RELEASE test diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index dfbc8eac..3f40f301 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -65,30 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/http-boot/pom.xml b/basic/http-boot/pom.xml index 4f2cd90d..9ad31e76 100644 --- a/basic/http-boot/pom.xml +++ b/basic/http-boot/pom.xml @@ -63,18 +63,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index d19db013..592344eb 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -52,10 +52,52 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-http + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-mail + 4.3.0.RELEASE + compile + + + org.springframework + spring-webmvc + 4.3.0.RELEASE + compile + + + commons-fileupload + commons-fileupload + 1.2.2 + compile + + + commons-io + commons-io + 2.4 + compile + javax.mail javax.mail-api - 1.5.2 + 1.5.5 + compile + + + com.sun.mail + javax.mail + 1.5.5 + compile + + + log4j + log4j + 1.2.17 compile @@ -70,42 +112,6 @@ 1.3 test - - org.springframework - spring-webmvc - 4.3.0.RC2 - compile - - - commons-io - commons-io - 2.4 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - commons-fileupload - commons-fileupload - 1.2.2 - compile - - - org.springframework.integration - spring-integration-http - 4.3.0.RC1 - compile - org.mockito mockito-core @@ -113,10 +119,10 @@ test - org.springframework.integration - spring-integration-mail - 4.3.0.RC1 - compile + org.springframework + spring-test + 4.3.0.RELEASE + test diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 82295158..2c0f652d 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -54,10 +54,10 @@ - junit - junit - 4.12 - test + org.springframework.integration + spring-integration-jdbc + 4.3.0.RELEASE + compile com.h2database @@ -65,36 +65,36 @@ 1.3.175 compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework.integration - spring-integration-jdbc - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index e43a6327..eb302de6 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -53,35 +53,17 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-stream - 4.3.0.RC1 - compile - - - junit - junit - 4.12 - test - org.springframework.integration spring-integration-jms - 4.3.0.RC1 + 4.3.0.RELEASE compile - - org.hamcrest - hamcrest-all - 1.3 - test - org.springframework.integration - spring-integration-test - 4.3.0.RC1 - test + spring-integration-stream + 4.3.0.RELEASE + compile org.apache.activemq @@ -95,24 +77,42 @@ 5.12.1 compile - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.integration + spring-integration-test + 4.3.0.RELEASE + test + diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index b89a3ed2..a07d4841 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -53,10 +53,22 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jmx + 4.3.0.RELEASE + compile + org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -72,27 +84,15 @@ test - org.springframework.integration - spring-integration-jmx - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index f1f7ac0d..a2fba86f 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples jpa @@ -58,10 +58,9 @@ - org.apache.openjpa - openjpa - 2.4.0 - runtime + org.springframework.boot + spring-boot-starter-data-jpa + compile commons-logging @@ -70,10 +69,16 @@ - junit - junit - 4.12 - test + org.springframework.integration + spring-integration-jpa + 4.3.0.RELEASE + compile + + + commons-logging + commons-logging + + com.h2database @@ -101,15 +106,21 @@ org.springframework - spring-test - 4.3.0.RC2 - test + spring-instrument + 4.3.0.RELEASE + runtime + + + commons-logging + commons-logging + + - org.springframework.integration - spring-integration-jpa - 4.3.0.RC1 - compile + org.apache.openjpa + openjpa + 2.4.0 + runtime commons-logging @@ -120,7 +131,7 @@ org.hibernate hibernate-entitymanager - 5.1.0.Final + 5.0.9.Final runtime @@ -129,17 +140,6 @@ - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework.boot - spring-boot-starter-test - test - org.eclipse.persistence org.eclipse.persistence.jpa @@ -153,27 +153,16 @@ - org.springframework.boot - spring-boot-starter-data-jpa - compile - - - commons-logging - commons-logging - - + junit + junit + 4.12 + test - org.springframework - spring-instrument - 4.3.0.RC2 - runtime - - - commons-logging - commons-logging - - + org.hamcrest + hamcrest-all + 1.3 + test org.mockito @@ -181,6 +170,17 @@ 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 5f676ace..b52f8a3b 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples kafka @@ -57,50 +57,27 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - - - org.springframework.integration - spring-integration-kafka - 2.0.0.RC1 - compile - - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-integration compile - org.springframework - spring-test - 4.3.0.RC2 - test + org.springframework.integration + spring-integration-kafka + 2.0.0.RELEASE + compile org.springframework.integration spring-integration-core - 4.3.0.RC1 + 4.3.0.RELEASE compile org.springframework.kafka spring-kafka-test - 1.0.0.RC1 + 1.0.1.RELEASE compile @@ -109,12 +86,35 @@ 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 584d9594..f10773d8 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -53,16 +53,34 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-mail + 4.3.0.RELEASE + compile + + + org.springframework + spring-context + 4.3.0.RELEASE + compile + javax.mail javax.mail-api - 1.5.2 + 1.5.5 compile com.sun.mail - mailapi - 1.5.2 + javax.mail + 1.5.5 + compile + + + log4j + log4j + 1.2.17 compile @@ -77,24 +95,6 @@ 1.3 test - - org.springframework - spring-context - 4.3.0.RC2 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core @@ -102,10 +102,10 @@ test - org.springframework.integration - spring-integration-mail - 4.3.0.RC1 - compile + org.springframework + spring-test + 4.3.0.RELEASE + test diff --git a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml index 7bba2e28..1d276015 100644 --- a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml +++ b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml @@ -10,7 +10,7 @@ xmlns:util="http://www.springframework.org/schema/util"> - + - + https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - org.springframework.integration spring-integration-mongodb - 4.3.0.RC1 + 4.3.0.RELEASE compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 3bb8f47d..0c911d0d 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples mqtt @@ -58,15 +58,26 @@ - org.springframework.integration - spring-integration-mqtt - 4.3.0.RC1 + org.springframework.boot + spring-boot-starter-integration compile org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-mqtt + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-java-dsl + 1.1.2.RELEASE compile @@ -82,26 +93,15 @@ test - org.springframework.boot - spring-boot-starter-integration - compile - - - org.springframework.integration - spring-integration-java-dsl - 1.1.2.RELEASE - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 61cbaec7..067e638a 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -65,30 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index f0099f0a..ba979369 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -56,7 +56,13 @@ org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -71,24 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index a2b54830..25588730 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -53,6 +53,24 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-sftp + 4.3.0.RELEASE + compile + + + org.apache.sshd + sshd-core + 0.13.0 + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,33 +84,15 @@ test - org.apache.sshd - sshd-core - 0.13.0 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.springframework.integration - spring-integration-sftp - 4.3.0.RC1 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index c8285b66..58be58f4 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples splunk @@ -57,6 +57,23 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-splunk + 1.1.0.RELEASE + compile + junit junit @@ -69,28 +86,6 @@ 1.3 test - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-integration - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - org.mockito mockito-core @@ -98,10 +93,15 @@ test - org.springframework.integration - spring-integration-splunk - 1.1.0.RELEASE - compile + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index e5e192d8..a813a7b3 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -53,41 +53,23 @@ https://github.com/spring-projects/spring-integration-samples - - org.slf4j - slf4j-api - 1.7.11 - compile - - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-all - 1.3 - test - org.springframework.integration spring-integration-amqp - 4.3.0.RC1 + 4.3.0.RELEASE compile org.springframework.integration spring-integration-ip - 4.3.0.RC1 + 4.3.0.RELEASE compile - org.springframework - spring-test - 4.3.0.RC2 - test + org.slf4j + slf4j-api + 1.7.11 + compile log4j @@ -101,12 +83,30 @@ 1.7.11 runtime + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 292f2037..5fde94c2 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -54,10 +54,10 @@ - junit - junit - 4.12 - test + org.springframework.integration + spring-integration-ip + 4.3.0.RELEASE + compile commons-lang @@ -65,42 +65,42 @@ 2.6 compile - - org.hamcrest - hamcrest-all - 1.3 - test - org.springframework.integration spring-integration-test - 4.3.0.RC1 + 4.3.0.RELEASE compile - - org.springframework.integration - spring-integration-ip - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 51d00e94..f5bd4d23 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -53,48 +53,30 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - org.springframework.integration spring-integration-file - 4.3.0.RC1 + 4.3.0.RELEASE compile - org.hamcrest - hamcrest-all - 1.3 - test + org.springframework.integration + spring-integration-http + 4.3.0.RELEASE + compile org.springframework.integration spring-integration-ws - 4.3.0.RC1 + 4.3.0.RELEASE compile org.springframework spring-webmvc - 4.3.0.RC2 + 4.3.0.RELEASE compile - - org.springframework.integration - spring-integration-test - 4.3.0.RC1 - test - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j @@ -102,10 +84,16 @@ compile - org.springframework.integration - spring-integration-http - 4.3.0.RC1 - compile + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test org.mockito @@ -113,6 +101,18 @@ 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.integration + spring-integration-test + 4.3.0.RELEASE + test + diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 47066391..1bc2a16a 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -56,7 +56,13 @@ org.springframework.integration spring-integration-twitter - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -71,24 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index b5cc451a..bd621375 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples web-sockets @@ -57,12 +57,6 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - org.springframework.boot spring-boot-starter-websocket @@ -73,6 +67,12 @@ spring-integration-websocket compile + + junit + junit + 4.12 + test + org.hamcrest hamcrest-all @@ -80,20 +80,20 @@ test - org.springframework.boot - spring-boot-starter-test + org.mockito + mockito-core + 1.9.5 test org.springframework spring-test - 4.3.0.RC2 + 4.3.0.RELEASE test - org.mockito - mockito-core - 1.9.5 + org.springframework.boot + spring-boot-starter-test test diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index f9331d78..b46a61a3 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -55,7 +55,25 @@ org.springframework.integration spring-integration-xml - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ws + 4.3.0.RELEASE + compile + + + org.springframework + spring-webmvc + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -71,33 +89,15 @@ test - org.springframework.integration - spring-integration-ws - 4.3.0.RC1 - compile - - - org.springframework - spring-webmvc - 4.3.0.RC2 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 81165a93..783190f0 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -56,7 +56,19 @@ org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ws + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -72,27 +84,15 @@ test - org.springframework.integration - spring-integration-ws - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 8fdf8f55..37dadf6f 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -56,7 +56,13 @@ org.springframework.integration spring-integration-xml - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -71,24 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index cb149a86..d4667f2a 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-xmpp + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,27 +78,15 @@ test - org.springframework.integration - spring-integration-xmpp - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/build.gradle b/build.gradle index ad3704f8..ed91291d 100644 --- a/build.gradle +++ b/build.gradle @@ -167,7 +167,7 @@ subprojects { subproject -> derbyVersion = '10.10.1.1' eclipseLinkVersion = '2.4.2' hamcrestVersion = '1.3' - hibernateVersion = '5.1.0.Final' + hibernateVersion = '5.0.9.Final' hibernateValidatorVersion = '4.2.0.Final' ftpServerVersion = '1.0.6' flexjsonVersion = '2.0' @@ -178,7 +178,7 @@ subprojects { subproject -> jacksonVersion = '2.3.2' jasyptVersion = '1.7' javaxInjectVersion = '1' - javaxMailVersion = '1.5.2' + javaxMailVersion = '1.5.5' jodaTimeVersion = '1.6' jtaVersion = '1.1' jtdsVersion = '1.2.6' @@ -570,6 +570,7 @@ project('http') { compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" compile "log4j:log4j:$log4jVersion" } @@ -673,9 +674,6 @@ project('si4demo') { compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "com.sun.mail:smtp:$javaxMailVersion" - compile "com.sun.mail:pop3:$javaxMailVersion" - compile "com.sun.mail:imap:$javaxMailVersion" compile "com.rometools:rome:1.5.0" testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -810,7 +808,7 @@ project('mail') { compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" compile "org.springframework:spring-context:$springVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:mailapi:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" compile "log4j:log4j:$log4jVersion" } @@ -1059,8 +1057,8 @@ project('mail-attachments') { compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" compile "commons-io:commons-io:$commonsIoVersion" - compile "com.sun.mail:mailapi:$javaxMailVersion" compile "log4j:log4j:$log4jVersion" testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 66cb59ce..c6ae75d7 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples cafe-dsl @@ -58,16 +58,21 @@ - junit - junit - 4.12 - test + org.springframework.integration.samples + cafe-si + 4.3.0.BUILD-SNAPSHOT + compile - org.hamcrest - hamcrest-all - 1.3 - test + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile com.google.guava @@ -75,16 +80,6 @@ 16.0.1 compile - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-integration - compile - org.springframework.integration spring-integration-java-dsl @@ -97,36 +92,41 @@ 2.0.7.RELEASE compile - - org.springframework.integration.samples - cafe-si - 4.3.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - io.projectreactor.spring reactor-spring-context 2.0.7.RELEASE compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java b/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java index 3eedb105..cbd14049 100644 --- a/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java +++ b/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java @@ -19,7 +19,7 @@ package org.springframework.integration.samples.dsl.cafe; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.samples.dsl.cafe.lambda.Application; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 3.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringBootTest(classes = Application.class) public class ApplicationTests { @Test diff --git a/dsl/pom.xml b/dsl/pom.xml index 07aeec50..d7b28d00 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -63,18 +63,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index b21bdfa5..91a2d6b1 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M3 + 1.4.0.RC1 org.springframework.integration.samples si4demo @@ -57,91 +57,16 @@ https://github.com/spring-projects/spring-integration-samples - - javax.mail - javax.mail-api - 1.5.2 - compile - - - com.sun.mail - smtp - 1.5.2 - compile - - - junit - junit - 4.12 - test - - - com.sun.mail - pop3 - 1.5.2 - compile - org.springframework.boot spring-boot-starter-web compile - - org.springframework - spring-test - 4.3.0.RC2 - test - - - com.rometools - rome - 1.5.0 - compile - - - org.springframework.integration - spring-integration-http - compile - - - com.sun.mail - imap - 1.5.2 - compile - - - org.springframework.integration - spring-integration-ip - compile - - - com.sun.mail - javax.mail - 1.5.2 - compile - - - org.hamcrest - hamcrest-all - 1.3 - 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.1.2.RELEASE - compile - org.springframework.integration spring-integration-mail @@ -152,12 +77,69 @@ spring-integration-twitter compile + + org.springframework.integration + spring-integration-http + compile + + + org.springframework.integration + spring-integration-ip + compile + + + org.springframework.integration + spring-integration-java-dsl + 1.1.2.RELEASE + compile + + + javax.mail + javax.mail-api + 1.5.5 + compile + + + com.sun.mail + javax.mail + 1.5.5 + compile + + + com.rometools + rome + 1.5.0 + compile + + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/gradle.properties b/gradle.properties index eff1f056..755afaf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=4.3.0.BUILD-SNAPSHOT -springBootVersion=1.4.0.M3 +springBootVersion=1.4.0.RC1 org.gradle.daemon=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 9ca6913f..c8b71d9c 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -53,6 +53,30 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile + + + io.projectreactor + reactor-stream + 2.0.7.RELEASE + compile + + + io.projectreactor.spring + reactor-spring-context + 2.0.7.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,39 +90,15 @@ test - io.projectreactor - reactor-stream - 2.0.7.RELEASE - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - - - log4j - log4j - 1.2.17 - compile - - - io.projectreactor.spring - reactor-spring-context - 2.0.7.RELEASE - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 4ccbe8be..7650ab17 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -65,30 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index f7b34311..39cb3079 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -56,7 +56,13 @@ org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -71,24 +77,18 @@ 1.3 test - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 7e00b802..4151f27c 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -53,42 +53,42 @@ https://github.com/spring-projects/spring-integration-samples - - junit - junit - 4.12 - test - org.springframework.integration spring-integration-file - 4.3.0.RC1 + 4.3.0.RELEASE compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 0ce367bb..47cfd8d3 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -53,16 +53,40 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-mail + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-file + 4.3.0.RELEASE + compile + javax.mail javax.mail-api - 1.5.2 + 1.5.5 compile com.sun.mail - mailapi - 1.5.2 + javax.mail + 1.5.5 + compile + + + commons-io + commons-io + 2.4 + compile + + + log4j + log4j + 1.2.17 compile @@ -71,59 +95,35 @@ 4.12 test - - org.springframework.integration - spring-integration-file - 4.3.0.RC1 - compile - org.hamcrest hamcrest-all 1.3 test - - commons-io - commons-io - 2.4 - compile - - - org.springframework.integration - spring-integration-test - 4.3.0.RC1 - test - - - org.subethamail - subethasmtp-wiser - 1.2 - test - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + org.springframework.integration - spring-integration-mail - 4.3.0.RC1 - compile + spring-integration-test + 4.3.0.RELEASE + test + + + org.subethamail + subethasmtp-wiser + 1.2 + test diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 49d640e9..e324391a 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -52,10 +52,28 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jmx + 4.3.0.RELEASE + compile + org.springframework.integration spring-integration-twitter - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-groovy + 4.3.0.RELEASE + compile + + + org.springframework + spring-webmvc + 4.3.0.RELEASE compile @@ -64,6 +82,12 @@ 1.2 compile + + log4j + log4j + 1.2.17 + compile + junit junit @@ -77,39 +101,15 @@ test - org.springframework - spring-webmvc - 4.3.0.RC2 - compile - - - org.springframework.integration - spring-integration-jmx - 4.3.0.RC1 - compile - - - org.springframework.integration - spring-integration-groovy - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 9dba0220..fe059c6e 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -52,6 +52,42 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-http + 4.3.0.RELEASE + compile + + + org.springframework + spring-webmvc + 4.3.0.RELEASE + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + commons-fileupload + commons-fileupload + 1.2.2 + compile + + + commons-io + commons-io + 2.4 + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -65,51 +101,15 @@ test - org.springframework - spring-webmvc - 4.3.0.RC2 - compile - - - commons-io - commons-io - 2.4 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - commons-fileupload - commons-fileupload - 1.2.2 - compile - - - org.springframework.integration - spring-integration-http - 4.3.0.RC1 - compile - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 9362ac9e..a9fcc5b7 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -53,87 +53,45 @@ - org.springframework - spring-aop - 4.3.0.RC2 + org.springframework.integration + spring-integration-http + 4.3.0.RELEASE compile - - org.springframework - spring-jdbc - 4.3.0.RC2 - compile - - - junit - junit - 4.12 - test - org.springframework spring-webmvc - 4.3.0.RC2 - compile - - - org.springframework.security - spring-security-config - 4.0.2.RELEASE + 4.3.0.RELEASE compile org.springframework spring-oxm - 4.3.0.RC2 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-http - 4.3.0.RC1 + 4.3.0.RELEASE compile org.springframework spring-tx - 4.3.0.RC2 + 4.3.0.RELEASE compile - org.hamcrest - hamcrest-all - 1.3 - test - - - org.jasypt - jasypt - 1.7 + org.springframework + spring-jdbc + 4.3.0.RELEASE compile org.springframework spring-context - 4.3.0.RC2 + 4.3.0.RELEASE compile - log4j - log4j - 1.2.17 - compile - - - org.springframework.security - spring-security-web - 4.0.2.RELEASE + org.springframework + spring-aop + 4.3.0.RELEASE compile @@ -142,12 +100,54 @@ 2.3.2 compile + + org.springframework.security + spring-security-web + 4.0.2.RELEASE + compile + + + org.springframework.security + spring-security-config + 4.0.2.RELEASE + compile + + + org.jasypt + jasypt + 1.7 + compile + + + log4j + log4j + 1.2.17 + compile + + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 3a293b61..d806103d 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -56,25 +56,31 @@ org.springframework.integration spring-integration-stream - 4.3.0.RC1 + 4.3.0.RELEASE compile - - junit - junit - 4.12 - test - org.springframework.integration - spring-integration-file - 4.3.0.RC1 + spring-integration-amqp + 4.3.0.RELEASE compile org.springframework.integration spring-integration-ftp - 4.3.0.RC1 + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-file + 4.3.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 compile @@ -83,18 +89,6 @@ 1.3 compile - - org.springframework.integration - spring-integration-amqp - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j @@ -102,10 +96,16 @@ compile - org.mockito - mockito-core - 1.9.5 - compile + junit + junit + 4.12 + test + + + org.springframework + spring-test + 4.3.0.RELEASE + test diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 8f3c9edc..93fd30b0 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -53,6 +53,24 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-core + 4.3.0.RELEASE + compile + + + javax.inject + javax.inject + 1 + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,33 +84,15 @@ test - javax.inject - javax.inject - 1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - org.springframework.integration - spring-integration-core - 4.3.0.RC1 - compile - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 6e7a7044..b75fcd3f 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -54,10 +54,10 @@ - junit - junit - 4.12 - test + org.springframework.integration + spring-integration-jdbc + 4.3.0.RELEASE + compile org.apache.derby @@ -65,36 +65,36 @@ 10.10.1.1 compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework.integration - spring-integration-jdbc - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test + diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 619d880e..10a05694 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -53,24 +53,36 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.3.0.RELEASE + compile + + + net.sourceforge.jtds + jtds + 1.2.6 + compile + c3p0 c3p0 0.9.1.2 compile + + log4j + log4j + 1.2.17 + compile + junit junit 4.12 test - - net.sourceforge.jtds - jtds - 1.2.6 - compile - org.hamcrest hamcrest-all @@ -78,27 +90,15 @@ test - org.springframework.integration - spring-integration-jdbc - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index e3e5e8bf..4c1d8baf 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,27 +78,15 @@ test - org.springframework.integration - spring-integration-jdbc - 4.3.0.RC1 - compile + org.mockito + mockito-core + 1.9.5 + test org.springframework spring-test - 4.3.0.RC2 - test - - - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + 4.3.0.RELEASE test diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index b2c4f5f7..fe38c992 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -53,6 +53,36 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.3.0.RELEASE + compile + + + postgresql + postgresql + 9.1-901-1.jdbc4 + compile + + + commons-dbcp + commons-dbcp + 1.2.2 + compile + + + commons-pool + commons-pool + 1.5.4 + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -65,36 +95,6 @@ 1.3 test - - commons-pool - commons-pool - 1.5.4 - compile - - - org.springframework.integration - spring-integration-jdbc - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - - - commons-dbcp - commons-dbcp - 1.2.2 - compile - - - log4j - log4j - 1.2.17 - compile - org.mockito mockito-core @@ -102,10 +102,10 @@ test - postgresql - postgresql - 9.1-901-1.jdbc4 - compile + org.springframework + spring-test + 4.3.0.RELEASE + test diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 1c95f6b6..da985cef 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ip + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,33 +78,21 @@ test - org.springframework.integration - spring-integration-test - 4.3.0.RC1 + org.mockito + mockito-core + 1.9.5 test - - org.springframework.integration - spring-integration-ip - 4.3.0.RC1 - compile - org.springframework spring-test - 4.3.0.RC2 + 4.3.0.RELEASE test - log4j - log4j - 1.2.17 - compile - - - org.mockito - mockito-core - 1.9.5 + org.springframework.integration + spring-integration-test + 4.3.0.RELEASE test diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index c15b3b71..91fae7d1 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -53,6 +53,30 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ws + 4.3.0.RELEASE + compile + + + org.springframework.integration + spring-integration-http + 4.3.0.RELEASE + compile + + + org.springframework + spring-web + 4.3.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + junit junit @@ -66,39 +90,15 @@ test - org.springframework.integration - spring-integration-ws - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 + org.mockito + mockito-core + 1.9.5 test org.springframework - spring-web - 4.3.0.RC2 - compile - - - log4j - log4j - 1.2.17 - compile - - - org.springframework.integration - spring-integration-http - 4.3.0.RC1 - compile - - - org.mockito - mockito-core - 1.9.5 + spring-test + 4.3.0.RELEASE test diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index d36c0f70..65441740 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -54,15 +54,15 @@ - junit - junit - 4.12 - test + org.springframework.integration + spring-integration-jdbc + 4.3.0.RELEASE + compile org.springframework.integration spring-integration-file - 4.3.0.RC1 + 4.3.0.RELEASE compile @@ -71,36 +71,36 @@ 1.3.175 compile - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.springframework.integration - spring-integration-jdbc - 4.3.0.RC1 - compile - - - org.springframework - spring-test - 4.3.0.RC2 - test - log4j log4j 1.2.17 compile + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + org.mockito mockito-core 1.9.5 test + + org.springframework + spring-test + 4.3.0.RELEASE + test +