From 68976a81a6e93b70a521e66327cf3d5ebbe03cd2 Mon Sep 17 00:00:00 2001 From: kasoban Date: Mon, 5 Oct 2015 11:01:29 +0200 Subject: [PATCH] Add specific slf4j-api version dependency When just importing the ftp example as a maven project, I ran into the issue of a slf4j version discrepancy described here: http://www.slf4j.org/faq.html#IllegalAccessError This is solved by adding the specific version dependency of `slf4j-api`. * Add the specific `slf4j-api` dependency to the Gradle script * Change the dependency scope for `slf4j-` impl to the `runtime`. * Regenerate POMs --- advanced/advanced-testing-examples/pom.xml | 18 ++-- advanced/dynamic-ftp/pom.xml | 14 +-- applications/cafe-scripted/pom.xml | 32 +++--- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 18 ++-- applications/cafe/cafe-si/pom.xml | 14 +-- applications/loan-broker/pom.xml | 14 +-- applications/loanshark/pom.xml | 100 ++++++++++-------- applications/stomp-chat/pom.xml | 4 +- basic/amqp/pom.xml | 16 +-- basic/barrier/pom.xml | 36 +++---- basic/control-bus/pom.xml | 14 +-- basic/enricher/pom.xml | 14 +-- basic/feed/pom.xml | 14 +-- basic/file/pom.xml | 14 +-- basic/ftp/pom.xml | 36 ++++--- basic/helloworld/pom.xml | 14 +-- basic/http/pom.xml | 28 ++--- basic/jdbc/pom.xml | 14 +-- basic/jms/pom.xml | 48 ++++----- basic/jmx/pom.xml | 26 ++--- basic/jpa/pom.xml | 26 ++--- basic/kafka/pom.xml | 40 ++----- basic/mail/pom.xml | 26 ++--- basic/mongodb/pom.xml | 14 +-- basic/oddeven/pom.xml | 14 +-- basic/quote/pom.xml | 14 +-- basic/sftp/pom.xml | 14 +-- basic/splunk/pom.xml | 59 ++++------- basic/tcp-amqp/pom.xml | 26 +++-- basic/tcp-client-server/pom.xml | 16 +-- basic/testing-examples/pom.xml | 36 +++---- basic/twitter/pom.xml | 14 +-- basic/web-sockets/pom.xml | 4 +- basic/ws-inbound-gateway/pom.xml | 28 ++--- basic/ws-outbound-gateway/pom.xml | 26 ++--- basic/xml/pom.xml | 14 +-- basic/xmpp/pom.xml | 14 +-- build.gradle | 23 ++-- dsl/cafe-dsl/pom.xml | 38 +++---- dsl/pom.xml | 2 +- dsl/si4demo/pom.xml | 22 ++-- intermediate/async-gateway/pom.xml | 32 +++--- intermediate/dynamic-poller/pom.xml | 14 +-- intermediate/errorhandling/pom.xml | 14 +-- intermediate/file-processing/pom.xml | 14 +-- intermediate/mail-attachments/pom.xml | 30 +++--- intermediate/monitoring/pom.xml | 28 ++--- intermediate/multipart-http/pom.xml | 16 +-- intermediate/rest-http/pom.xml | 72 ++++++------- intermediate/retry-and-more/pom.xml | 40 +++---- .../splitter-aggregator-reaper/pom.xml | 14 +-- intermediate/stored-procedures-derby/pom.xml | 14 +-- intermediate/stored-procedures-ms/pom.xml | 14 +-- intermediate/stored-procedures-oracle/pom.xml | 14 +-- .../stored-procedures-postgresql/pom.xml | 14 +-- .../tcp-client-server-multiplex/pom.xml | 22 ++-- intermediate/travel/pom.xml | 30 +++--- intermediate/tx-synch/pom.xml | 26 ++--- 59 files changed, 677 insertions(+), 693 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 8293c94c..b340b2c6 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jms + 4.2.2.RELEASE + compile + junit junit @@ -67,8 +73,8 @@ org.springframework.integration - spring-integration-jms - 4.2.0.RELEASE + spring-integration-groovy + 4.2.2.RELEASE compile @@ -77,16 +83,10 @@ 1.1-rev-1 compile - - org.springframework.integration - spring-integration-groovy - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 5e8e8fc0..ba1c51a5 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ftp + 4.2.2.RELEASE + compile + junit junit @@ -65,16 +71,10 @@ 1.3 test - - org.springframework.integration - spring-integration-ftp - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index eddf6a52..dcd5d578 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-rmi + 4.2.2.RELEASE + compile + junit junit @@ -65,28 +71,16 @@ 1.3 test - - org.springframework.integration - spring-integration-jmx - 4.2.0.RELEASE - compile - org.codehaus.groovy groovy-all 2.3.0 compile - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE - compile - org.springframework.integration spring-integration-groovy - 4.2.0.RELEASE + 4.2.2.RELEASE compile @@ -98,9 +92,15 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.springframework.integration + spring-integration-jmx + 4.2.2.RELEASE + compile + log4j log4j @@ -121,8 +121,8 @@ org.springframework.integration - spring-integration-rmi - 4.2.0.RELEASE + spring-integration-stream + 4.2.2.RELEASE compile diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index b5e166f6..c9cd479c 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -74,13 +74,13 @@ org.springframework.integration spring-integration-amqp - 4.2.0.RELEASE + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index fa83a931..2a1f8dae 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jms + 4.2.2.RELEASE + compile + junit junit @@ -74,25 +80,19 @@ org.apache.activemq activemq-broker - 5.11.1 + 5.12.1 compile org.apache.activemq activemq-kahadb-store - 5.11.1 - compile - - - org.springframework.integration - spring-integration-jms - 4.2.0.RELEASE + 5.12.1 compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 8494e5bd..ffc5b000 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -65,16 +65,10 @@ 1.3 test - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -95,6 +89,12 @@ 1.9.5 test + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 7466de6f..9706fa8a 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ip + 4.2.2.RELEASE + compile + junit junit @@ -65,16 +71,10 @@ 1.3 test - - org.springframework.integration - spring-integration-ip - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 6e7a522d..08ad68bc 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -52,23 +52,23 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework + spring-tx + 4.2.3.RELEASE + compile + javax.transaction jta 1.1 compile - - org.springframework - spring-context - 4.2.0.RELEASE - compile - org.slf4j jcl-over-slf4j 1.7.11 - compile + runtime junit @@ -82,12 +82,30 @@ 1.2.2 compile + + org.springframework + spring-jdbc + 4.2.3.RELEASE + compile + + + org.springframework + spring-aop + 4.2.3.RELEASE + compile + org.hibernate hibernate-entitymanager 4.2.11.Final compile + + org.slf4j + slf4j-api + 1.7.11 + compile + commons-pool commons-pool @@ -95,9 +113,15 @@ compile - org.springframework.integration - spring-integration-ip - 4.2.0.RELEASE + org.springframework + spring-webmvc + 4.2.3.RELEASE + compile + + + org.springframework + spring-context + 4.2.3.RELEASE compile @@ -130,23 +154,11 @@ 2.3.3.RELEASE compile - - org.springframework - spring-test - 4.2.0.RELEASE - test - log4j log4j 1.2.17 - compile - - - org.springframework - spring-tx - 4.2.0.RELEASE - compile + runtime org.hsqldb @@ -158,36 +170,36 @@ org.slf4j slf4j-log4j12 1.7.11 - compile + runtime - org.springframework - spring-aop - 4.2.0.RELEASE - compile - - - org.springframework - spring-webmvc - 4.2.0.RELEASE + org.springframework.integration + spring-integration-ip + 4.2.2.RELEASE compile org.springframework spring-aspects - 4.2.0.RELEASE - compile - - - org.aspectj - aspectjtools - 1.8.4 + 4.2.3.RELEASE compile org.springframework spring-orm - 4.2.0.RELEASE + 4.2.3.RELEASE + compile + + + org.springframework + spring-test + 4.2.3.RELEASE + test + + + org.aspectj + aspectjtools + 1.8.4 compile @@ -208,12 +220,6 @@ 2.0 compile - - org.springframework - spring-jdbc - 4.2.0.RELEASE - compile - net.sf.flexjson flexjson diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 6812fab3..3a85b29b 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.3.0.M5 + 1.3.0.RELEASE org.springframework.integration.samples stomp-chat @@ -97,7 +97,7 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 26c3a234..339c3f08 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -68,19 +68,13 @@ org.springframework.integration spring-integration-amqp - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -95,6 +89,12 @@ 1.9.5 test + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index be3c1267..38eb25c4 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.0.M5 + 1.3.0.RELEASE org.springframework.integration.samples barrier @@ -57,12 +57,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - junit junit @@ -90,29 +84,35 @@ spring-boot-starter-amqp compile - - org.springframework.integration - spring-integration-amqp - 4.2.0.RELEASE - compile - org.springframework.boot spring-boot-starter-web compile - org.springframework - spring-test - 4.2.0.RELEASE - test + org.springframework.integration + spring-integration-amqp + 4.2.2.RELEASE + compile + + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE + compile org.springframework.integration spring-integration-http - 4.2.0.RELEASE + 4.2.2.RELEASE compile + + org.springframework + spring-test + 4.2.3.RELEASE + test + org.mockito mockito-core diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index ee7b5d8c..050fa0e7 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -53,12 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - junit junit @@ -71,10 +65,16 @@ 1.3 test + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 9d5945da..2cb8fac6 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -53,12 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - com.h2database h2 @@ -77,10 +71,16 @@ 1.3 test + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 384a1459..35b6738b 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -65,18 +65,18 @@ 1.3 test - - org.springframework.integration - spring-integration-feed - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.springframework.integration + spring-integration-feed + 4.2.2.RELEASE + compile + log4j log4j diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 188ef94c..6f0028fd 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -59,22 +59,22 @@ 4.11 test + + org.springframework.integration + spring-integration-file + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-file - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 5c1d6c4f..25f071f8 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ftp + 4.2.2.RELEASE + compile + + + org.slf4j + slf4j-api + 1.7.11 + compile + junit junit @@ -71,18 +83,6 @@ 2.4 compile - - org.springframework.integration - spring-integration-test - 4.2.0.RELEASE - test - - - org.springframework.integration - spring-integration-ftp - 4.2.0.RELEASE - compile - org.apache.ftpserver ftpserver-core @@ -92,20 +92,26 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE + test + + + org.springframework.integration + spring-integration-test + 4.2.2.RELEASE test log4j log4j 1.2.17 - compile + runtime org.slf4j slf4j-log4j12 1.7.11 - compile + runtime org.mockito diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index ad5c67c2..785d7585 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -53,12 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - junit junit @@ -71,10 +65,16 @@ 1.3 test + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 75016c16..93a4dc5f 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -79,13 +79,25 @@ org.springframework spring-webmvc - 4.2.0.RELEASE + 4.2.3.RELEASE + compile + + + org.springframework.integration + spring-integration-mail + 4.2.2.RELEASE + compile + + + org.springframework.integration + spring-integration-http + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -100,24 +112,12 @@ 1.2.2 compile - - org.springframework.integration - spring-integration-http - 4.2.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework.integration - spring-integration-mail - 4.2.0.RELEASE - compile - diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 517c9bc7..625ffe9c 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.2.2.RELEASE + compile + com.h2database h2 @@ -71,16 +77,10 @@ 1.3 test - - org.springframework.integration - spring-integration-jdbc - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index d1a2e0f0..77fbbb4d 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jms + 4.2.2.RELEASE + compile + junit junit @@ -65,40 +71,28 @@ 1.3 test - - org.springframework.integration - spring-integration-test - 4.2.0.RELEASE - test - - - org.springframework.integration - spring-integration-jms - 4.2.0.RELEASE - compile - org.apache.activemq activemq-broker - 5.11.1 + 5.12.1 compile org.apache.activemq activemq-kahadb-store - 5.11.1 - compile - - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE + 5.12.1 compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE + test + + + org.springframework.integration + spring-integration-test + 4.2.2.RELEASE test @@ -107,18 +101,18 @@ 1.2.17 compile - - org.slf4j - slf4j-log4j12 - 1.7.11 - compile - org.mockito mockito-core 1.9.5 test + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 5598eeab..e24e4248 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -65,24 +65,18 @@ 1.3 test - - org.springframework.integration - spring-integration-jmx - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.springframework.integration + spring-integration-jmx + 4.2.2.RELEASE + compile + log4j log4j @@ -95,6 +89,12 @@ 1.9.5 test + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 8652a9aa..6e0047b2 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -89,6 +89,12 @@ 2.3.0 runtime + + org.springframework.integration + spring-integration-jpa + 4.2.2.RELEASE + compile + org.eclipse.persistence javax.persistence @@ -98,7 +104,7 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -107,24 +113,18 @@ 1.2.17 compile + + org.springframework + spring-instrument + 4.2.3.RELEASE + runtime + org.mockito mockito-core 1.9.5 test - - org.springframework.integration - spring-integration-jpa - 4.2.0.RELEASE - compile - - - org.springframework - spring-instrument - 4.2.0.RELEASE - runtime - diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ecb7e49b..00d2457b 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.0.M5 + 1.3.0.RELEASE org.springframework.integration.samples kafka @@ -57,12 +57,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - junit junit @@ -87,22 +81,22 @@ org.springframework.integration - spring-integration-kafka - 1.2.2.BUILD-SNAPSHOT - - - org.slf4j - slf4j-log4j12 - - + spring-integration-core + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.springframework.integration + spring-integration-kafka + 1.3.0.RELEASE + compile + org.mockito mockito-core @@ -116,23 +110,9 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - org.springframework.boot spring-boot-maven-plugin diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index e15b6b2e..5fca18c4 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -65,12 +65,6 @@ 1.5.2 compile - - org.springframework - spring-context - 4.2.0.RELEASE - compile - junit junit @@ -83,10 +77,22 @@ 1.3 test + + org.springframework + spring-context + 4.2.3.RELEASE + compile + + + org.springframework.integration + spring-integration-mail + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -101,12 +107,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-mail - 4.2.0.RELEASE - compile - diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 03c6af28..843af25b 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-mongodb + 4.2.2.RELEASE + compile + junit junit @@ -65,16 +71,10 @@ 1.3 test - - org.springframework.integration - spring-integration-mongodb - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 5013def6..77815b21 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -53,12 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - junit junit @@ -71,10 +65,16 @@ 1.3 test + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 4c7fe3b3..9c6588db 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -65,16 +65,10 @@ 1.3 test - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -89,6 +83,12 @@ 1.9.5 test + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index f2417efe..b2b519f4 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -65,6 +65,12 @@ 1.3 test + + org.springframework.integration + spring-integration-sftp + 4.2.2.RELEASE + compile + org.apache.sshd sshd-core @@ -74,7 +80,7 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -83,12 +89,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-sftp - 4.2.0.RELEASE - compile - org.mockito mockito-core diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index f75dd36f..56ffcf25 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -9,8 +9,8 @@ org.springframework.integration.samples splunk 4.1.0.BUILD-SNAPSHOT - Apache splunk Sample - Apache splunk Sample + Splunk Sample + Splunk Sample http://projects.spring.io/spring-integration SpringIO @@ -57,18 +57,18 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.1.RELEASE - compile - junit junit 4.11 test + + org.hamcrest + hamcrest-all + 1.3 + test + org.springframework.boot spring-boot-starter-test @@ -79,29 +79,30 @@ spring-boot-starter-integration compile - - com.splunk - splunk - 1.5.0.0 - org.springframework.integration - spring-integration-splunk - 1.1.0.RELEASE - - - org.slf4j - slf4j-log4j12 - - + spring-integration-core + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework.integration + spring-integration-splunk + 1.1.0.RELEASE + compile + @@ -109,23 +110,9 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - org.springframework.boot spring-boot-maven-plugin diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 72ecca0d..6fe5363b 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -53,6 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ip + 4.2.2.RELEASE + compile + + + org.slf4j + slf4j-api + 1.7.11 + compile + junit junit @@ -68,32 +80,26 @@ org.springframework.integration spring-integration-amqp - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-ip - 4.2.0.RELEASE + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test log4j log4j 1.2.17 - compile + runtime org.slf4j slf4j-log4j12 1.7.11 - compile + runtime org.mockito diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index c50ee08d..0bf7fad2 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ip + 4.2.2.RELEASE + compile + commons-lang commons-lang @@ -74,19 +80,13 @@ org.springframework.integration spring-integration-test - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-ip - 4.2.0.RELEASE + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d0ed9f69..242ca54b 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -53,46 +53,46 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-ws - 4.2.0.RELEASE - compile - junit junit 4.11 test + + org.springframework.integration + spring-integration-file + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-test - 4.2.0.RELEASE - test - org.springframework spring-webmvc - 4.2.0.RELEASE + 4.2.3.RELEASE compile org.springframework.integration - spring-integration-file - 4.2.0.RELEASE + spring-integration-http + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE + test + + + org.springframework.integration + spring-integration-test + 4.2.2.RELEASE test @@ -103,8 +103,8 @@ org.springframework.integration - spring-integration-http - 4.2.0.RELEASE + spring-integration-ws + 4.2.2.RELEASE compile diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 3da3e3f4..c5850a85 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -68,21 +68,21 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.springframework.integration + spring-integration-twitter + 4.2.2.RELEASE + compile + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-twitter - 4.2.0.RELEASE - compile - org.mockito mockito-core diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index e8347b65..054d5f16 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.3.0.M5 + 1.3.0.RELEASE org.springframework.integration.samples web-sockets @@ -87,7 +87,7 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index fe29cb1c..c3de1565 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -52,40 +52,34 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-ws - 4.2.0.RELEASE - compile - junit junit 4.11 test + + org.springframework.integration + spring-integration-xml + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-xml - 4.2.0.RELEASE - compile - org.springframework spring-webmvc - 4.2.0.RELEASE + 4.2.3.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -94,6 +88,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-ws + 4.2.2.RELEASE + compile + org.mockito mockito-core diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 6b2597c9..b50eefa5 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -53,12 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-ws - 4.2.0.RELEASE - compile - junit junit @@ -71,16 +65,10 @@ 1.3 test - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -89,12 +77,24 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-ws + 4.2.2.RELEASE + compile + org.mockito mockito-core 1.9.5 test + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 714022ac..236784f7 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -59,22 +59,22 @@ 4.11 test + + org.springframework.integration + spring-integration-xml + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-xml - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 11fb3e50..8513e292 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -68,21 +68,21 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.springframework.integration + spring-integration-xmpp + 4.2.2.RELEASE + compile + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-xmpp - 4.2.0.RELEASE - compile - org.mockito mockito-core diff --git a/build.gradle b/build.gradle index 9a07d9e7..7abd417b 100644 --- a/build.gradle +++ b/build.gradle @@ -195,7 +195,7 @@ subprojects { subproject -> springIntegrationVersion = '4.2.2.RELEASE' springIntegrationDslVersion = '1.1.1.RELEASE' springIntegrationKafkaVersion = '1.3.0.RELEASE' - springIntegrationSplunkVersion = '1.1.0.RELEASE' + springIntegrationSplunkVersion = '1.1.0.RELEASE' springVersion = '4.2.3.RELEASE' springSecurityVersion = '4.0.2.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' @@ -391,8 +391,6 @@ project('loanshark') { compile "org.springframework:spring-context:$springVersion" compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" - compile "org.slf4j:slf4j-log4j12:$slf4jVersion" - compile "org.slf4j:jcl-over-slf4j:$slf4jVersion" compile "commons-digester:commons-digester:$commonsDigesterVersion" compile "commons-pool:commons-pool:$commonsPoolVersion" compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" @@ -405,7 +403,11 @@ project('loanshark') { compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" compile "org.springframework.webflow:spring-js:$springWebFlowVersion" - compile "log4j:log4j:$log4jVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" + + runtime "log4j:log4j:$log4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion" } } @@ -513,8 +515,10 @@ project('ftp') { compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" - compile "org.slf4j:slf4j-log4j12:$slf4jVersion" - compile "log4j:log4j:$log4jVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" + + runtime "log4j:log4j:$log4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" } @@ -691,7 +695,6 @@ project('jms') { dependencies { compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" - compile "org.slf4j:slf4j-log4j12:$slf4jVersion" compile "org.apache.activemq:activemq-broker:$activeMqVersion" compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" @@ -833,8 +836,10 @@ project('tcp-amqp') { dependencies { compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" - compile "org.slf4j:slf4j-log4j12:$slf4jVersion" - compile "log4j:log4j:$log4jVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" + + runtime "log4j:log4j:$log4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" } } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index e63775fd..efffdb6d 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.3.0.M5 + 1.3.0.RELEASE org.springframework.integration.samples cafe-dsl @@ -57,18 +57,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - - - io.projectreactor - reactor-stream - 2.0.5.RELEASE - compile - junit junit @@ -104,23 +92,35 @@ compile - io.projectreactor.spring - reactor-spring-context - 2.0.5.RELEASE + io.projectreactor + reactor-stream + 2.0.7.RELEASE compile org.springframework.integration - spring-integration-java-dsl - 1.1.0.RELEASE + spring-integration-core + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test + + org.springframework.integration + spring-integration-java-dsl + 1.1.1.RELEASE + compile + + + io.projectreactor.spring + reactor-spring-context + 2.0.7.RELEASE + compile + org.mockito mockito-core diff --git a/dsl/pom.xml b/dsl/pom.xml index 6de92b80..5657f063 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -66,7 +66,7 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index cd4448d9..a6dff970 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.0.M5 + 1.3.0.RELEASE org.springframework.integration.samples si4demo @@ -87,10 +87,10 @@ compile - org.springframework.integration - spring-integration-java-dsl - 1.1.0.RELEASE - compile + org.springframework + spring-test + 4.2.3.RELEASE + test com.rometools @@ -98,6 +98,12 @@ 1.5.0 compile + + org.springframework.integration + spring-integration-java-dsl + 1.1.1.RELEASE + compile + com.sun.mail imap @@ -126,12 +132,6 @@ spring-boot-starter-integration compile - - org.springframework - spring-test - 4.2.0.RELEASE - test - org.springframework.integration spring-integration-mail diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 944f9029..16140f89 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -53,18 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - - - io.projectreactor - reactor-stream - 2.0.5.RELEASE - compile - junit junit @@ -78,15 +66,21 @@ test - io.projectreactor.spring - reactor-spring-context - 2.0.5.RELEASE + io.projectreactor + reactor-stream + 2.0.7.RELEASE + compile + + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -95,6 +89,12 @@ 1.2.17 compile + + io.projectreactor.spring + reactor-spring-context + 2.0.7.RELEASE + compile + org.mockito mockito-core diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 293af061..fbec7826 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -53,12 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - junit junit @@ -71,10 +65,16 @@ 1.3 test + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 3723f57e..76e0bd57 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -65,16 +65,10 @@ 1.3 test - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -89,6 +83,12 @@ 1.9.5 test + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index d1b866a9..9fdb78d0 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -59,22 +59,22 @@ 4.11 test + + org.springframework.integration + spring-integration-file + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-file - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 01c73146..e60790c5 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -71,6 +71,12 @@ 4.11 test + + org.springframework.integration + spring-integration-file + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all @@ -83,12 +89,6 @@ 2.4 compile - - org.springframework.integration - spring-integration-test - 4.2.0.RELEASE - test - org.subethamail subethasmtp-wiser @@ -97,14 +97,20 @@ org.springframework.integration - spring-integration-file - 4.2.0.RELEASE + spring-integration-mail + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE + test + + + org.springframework.integration + spring-integration-test + 4.2.2.RELEASE test @@ -119,12 +125,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-mail - 4.2.0.RELEASE - compile - diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index fff2e03e..b3cec19a 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -72,38 +72,38 @@ org.springframework.integration - spring-integration-jmx - 4.2.0.RELEASE + spring-integration-groovy + 4.2.2.RELEASE compile org.springframework spring-webmvc - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-groovy - 4.2.0.RELEASE + 4.2.3.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test - log4j - log4j - 1.2.17 + org.springframework.integration + spring-integration-jmx + 4.2.2.RELEASE compile org.springframework.integration spring-integration-twitter - 4.2.0.RELEASE + 4.2.2.RELEASE + compile + + + log4j + log4j + 1.2.17 compile diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 26646939..06b56e03 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -73,13 +73,19 @@ org.springframework spring-webmvc - 4.2.0.RELEASE + 4.2.3.RELEASE + compile + + + org.springframework.integration + spring-integration-http + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -94,12 +100,6 @@ 1.2.2 compile - - org.springframework.integration - spring-integration-http - 4.2.0.RELEASE - compile - com.fasterxml.jackson.core jackson-databind diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 1bdf9e51..84a43fc9 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -54,8 +54,8 @@ org.springframework - spring-context - 4.2.0.RELEASE + spring-tx + 4.2.3.RELEASE compile @@ -64,24 +64,42 @@ 4.11 test - - org.springframework - spring-aop - 4.2.0.RELEASE - compile - - - org.springframework - spring-webmvc - 4.2.0.RELEASE - compile - org.springframework.security spring-security-config 4.0.2.RELEASE compile + + org.springframework + spring-oxm + 4.2.3.RELEASE + compile + + + org.springframework.integration + spring-integration-http + 4.2.2.RELEASE + compile + + + org.springframework + spring-test + 4.2.3.RELEASE + test + + + org.springframework + spring-jdbc + 4.2.3.RELEASE + compile + + + org.springframework + spring-aop + 4.2.3.RELEASE + compile + org.hamcrest hamcrest-all @@ -90,8 +108,8 @@ org.springframework - spring-oxm - 4.2.0.RELEASE + spring-webmvc + 4.2.3.RELEASE compile @@ -102,40 +120,22 @@ org.springframework - spring-jdbc - 4.2.0.RELEASE + spring-context + 4.2.3.RELEASE compile - - org.springframework - spring-test - 4.2.0.RELEASE - test - log4j log4j 1.2.17 compile - - org.springframework - spring-tx - 4.2.0.RELEASE - compile - org.springframework.security spring-security-web 4.0.2.RELEASE compile - - org.springframework.integration - spring-integration-http - 4.2.0.RELEASE - compile - com.fasterxml.jackson.core jackson-databind diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index a9904e93..ce1631ad 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -53,12 +53,24 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ftp + 4.2.2.RELEASE + compile + junit junit 4.11 test + + org.springframework.integration + spring-integration-file + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all @@ -68,31 +80,13 @@ org.springframework.integration spring-integration-amqp - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-ftp - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-stream - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-file - 4.2.0.RELEASE + 4.2.2.RELEASE compile org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -107,6 +101,12 @@ 1.9.5 compile + + org.springframework.integration + spring-integration-stream + 4.2.2.RELEASE + compile + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 9e3e3a2d..b69a7afc 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -53,12 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.2.0.RELEASE - compile - junit junit @@ -77,10 +71,16 @@ 1 compile + + org.springframework.integration + spring-integration-core + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index c7bc0496..7e054163 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.2.2.RELEASE + compile + junit junit @@ -71,16 +77,10 @@ 1.3 test - - org.springframework.integration - spring-integration-jdbc - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index a1f3e77e..be021eb4 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.2.2.RELEASE + compile + c3p0 c3p0 @@ -77,16 +83,10 @@ 1.3 test - - org.springframework.integration - spring-integration-jdbc - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 2028a4ef..2f3a0314 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.2.2.RELEASE + compile + junit junit @@ -65,16 +71,10 @@ 1.3 test - - org.springframework.integration - spring-integration-jdbc - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index d606fd06..eb948c65 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.2.2.RELEASE + compile + junit junit @@ -71,12 +77,6 @@ 1.5.4 compile - - org.springframework.integration - spring-integration-jdbc - 4.2.0.RELEASE - compile - commons-dbcp commons-dbcp @@ -86,7 +86,7 @@ org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 71b923c7..114fcb30 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-ip + 4.2.2.RELEASE + compile + junit junit @@ -66,21 +72,15 @@ test - org.springframework.integration - spring-integration-test - 4.2.0.RELEASE + org.springframework + spring-test + 4.2.3.RELEASE test org.springframework.integration - spring-integration-ip - 4.2.0.RELEASE - compile - - - org.springframework - spring-test - 4.2.0.RELEASE + spring-integration-test + 4.2.2.RELEASE test diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 765dfc1f..27f9d7bb 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -53,18 +53,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-ws - 4.2.0.RELEASE - compile - - - org.springframework - spring-web - 4.2.0.RELEASE - compile - junit junit @@ -77,10 +65,16 @@ 1.3 test + + org.springframework.integration + spring-integration-http + 4.2.2.RELEASE + compile + org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test @@ -89,10 +83,16 @@ 1.2.17 compile + + org.springframework + spring-web + 4.2.3.RELEASE + compile + org.springframework.integration - spring-integration-http - 4.2.0.RELEASE + spring-integration-ws + 4.2.2.RELEASE compile diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index f4bc9c13..4e827327 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -53,6 +53,12 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-jdbc + 4.2.2.RELEASE + compile + com.h2database h2 @@ -65,28 +71,22 @@ 4.11 test + + org.springframework.integration + spring-integration-file + 4.2.2.RELEASE + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-jdbc - 4.2.0.RELEASE - compile - - - org.springframework.integration - spring-integration-file - 4.2.0.RELEASE - compile - org.springframework spring-test - 4.2.0.RELEASE + 4.2.3.RELEASE test