From ecab656cc15f2067c548c7dbdfdcfcc5a512cda3 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 11 Sep 2015 13:05:41 -0400 Subject: [PATCH] INTEXT-191: Add Apache Kafka Sample JIRA: https://jira.spring.io/browse/INTEXT-191 Polishing and build.gradle fix for pom generation --- advanced/advanced-testing-examples/pom.xml | 34 +-- advanced/dynamic-ftp/pom.xml | 28 +-- applications/cafe-scripted/pom.xml | 50 ++-- applications/cafe/cafe-amqp/pom.xml | 38 +-- applications/cafe/cafe-jms/pom.xml | 40 ++-- applications/cafe/cafe-si/pom.xml | 38 +-- applications/loan-broker/pom.xml | 28 +-- applications/loanshark/pom.xml | 141 ++++++----- applications/stomp-chat/pom.xml | 51 ++-- basic/amqp/pom.xml | 50 ++-- basic/barrier/pom.xml | 71 +++--- basic/control-bus/pom.xml | 28 +-- basic/enricher/pom.xml | 28 +-- basic/feed/pom.xml | 28 +-- basic/file/pom.xml | 28 +-- basic/ftp/pom.xml | 40 ++-- basic/helloworld/pom.xml | 28 +-- basic/http/pom.xml | 85 ++++--- basic/jdbc/pom.xml | 38 +-- basic/jms/pom.xml | 58 ++--- basic/jmx/pom.xml | 48 ++-- basic/jpa/pom.xml | 50 ++-- basic/kafka/README.md | 39 +++ .../samples/kafka/Application.java | 224 ++++++++++++++++++ .../kafka/src/main/resources/application.yml | 7 + basic/kafka/src/main/resources/logback.xml | 14 ++ .../samples/barrier/ApplicationTests.java | 39 +++ basic/mail/pom.xml | 40 ++-- basic/mongodb/pom.xml | 28 +-- basic/oddeven/pom.xml | 28 +-- basic/quote/pom.xml | 38 +-- basic/sftp/pom.xml | 50 ++-- basic/tcp-amqp/pom.xml | 42 ++-- basic/tcp-client-server/pom.xml | 42 ++-- basic/testing-examples/pom.xml | 60 ++--- basic/twitter/pom.xml | 34 +-- basic/web-sockets/pom.xml | 51 ++-- basic/ws-inbound-gateway/pom.xml | 73 +++--- basic/ws-outbound-gateway/pom.xml | 40 ++-- basic/xml/pom.xml | 28 +-- basic/xmpp/pom.xml | 38 +-- build.gradle | 135 ++++++++--- dsl/cafe-dsl/pom.xml | 86 +++---- dsl/pom.xml | 28 +-- dsl/si4demo/pom.xml | 63 +++-- intermediate/async-gateway/pom.xml | 40 ++-- intermediate/dynamic-poller/pom.xml | 28 +-- intermediate/errorhandling/pom.xml | 38 +-- intermediate/file-processing/pom.xml | 28 +-- intermediate/mail-attachments/pom.xml | 62 ++--- intermediate/monitoring/pom.xml | 73 +++--- intermediate/multipart-http/pom.xml | 73 +++--- intermediate/rest-http/pom.xml | 109 +++++---- intermediate/retry-and-more/pom.xml | 56 ++--- .../splitter-aggregator-reaper/pom.xml | 28 +-- intermediate/stored-procedures-derby/pom.xml | 38 +-- intermediate/stored-procedures-ms/pom.xml | 38 +-- intermediate/stored-procedures-oracle/pom.xml | 38 +-- .../stored-procedures-postgresql/pom.xml | 38 +-- .../tcp-client-server-multiplex/pom.xml | 40 ++-- intermediate/travel/pom.xml | 40 ++-- intermediate/tx-synch/pom.xml | 42 ++-- 62 files changed, 1715 insertions(+), 1349 deletions(-) create mode 100644 basic/kafka/README.md create mode 100644 basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java create mode 100644 basic/kafka/src/main/resources/application.yml create mode 100644 basic/kafka/src/main/resources/logback.xml create mode 100644 basic/kafka/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d6e72443..8293c94c 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -80,8 +67,8 @@ org.springframework.integration - spring-integration-groovy - 4.1.6.RELEASE + spring-integration-jms + 4.2.0.RELEASE compile @@ -92,10 +79,16 @@ org.springframework.integration - spring-integration-jms - 4.1.6.RELEASE + spring-integration-groovy + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -109,4 +102,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e31c9da1..5e8e8fc0 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -81,9 +68,15 @@ org.springframework.integration spring-integration-ftp - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 3562d7ca..eddf6a52 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,18 +59,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-jmx + 4.2.0.RELEASE + compile + org.codehaus.groovy groovy-all @@ -86,14 +79,14 @@ org.springframework.integration - spring-integration-groovy - 4.1.6.RELEASE + spring-integration-stream + 4.2.0.RELEASE compile org.springframework.integration - spring-integration-rmi - 4.1.6.RELEASE + spring-integration-groovy + 4.2.0.RELEASE compile @@ -102,6 +95,12 @@ 2.5.3 compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -114,12 +113,6 @@ 1.7.12 compile - - org.springframework.integration - spring-integration-jmx - 4.1.6.RELEASE - compile - org.mockito mockito-core @@ -128,9 +121,16 @@ org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE + spring-integration-rmi + 4.2.0.RELEASE compile + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 3c483cf2..b5e166f6 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -52,32 +52,13 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-amqp - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -90,6 +71,18 @@ 4.1.0.BUILD-SNAPSHOT compile + + org.springframework.integration + spring-integration-amqp + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -103,4 +96,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 894d1d09..fa83a931 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,41 +59,41 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration.samples + cafe-si + 4.1.0.BUILD-SNAPSHOT + compile + org.apache.activemq activemq-broker - 5.11.0 + 5.11.1 compile org.apache.activemq activemq-kahadb-store - 5.11.0 + 5.11.1 compile org.springframework.integration spring-integration-jms - 4.1.6.RELEASE + 4.2.0.RELEASE compile - org.springframework.integration.samples - cafe-si - 4.1.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 4.2.0.RELEASE + test log4j @@ -115,4 +108,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index f5cf04eb..8494e5bd 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,18 +59,24 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-stream + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -96,11 +95,12 @@ 1.9.5 test - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index edc27d5b..7466de6f 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -81,9 +68,15 @@ org.springframework.integration spring-integration-ip - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 5ba579ee..6e7a522d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 org.springframework.integration.samples loanshark 4.1.0.BUILD-SNAPSHOT - war Loan Shark Sample Loan Shark Sample http://projects.spring.io/spring-integration @@ -53,27 +51,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /loanshark - - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - javax.transaction @@ -81,6 +58,12 @@ 1.1 compile + + org.springframework + spring-context + 4.2.0.RELEASE + compile + org.slf4j jcl-over-slf4j @@ -93,54 +76,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - - - org.springframework - spring-orm - 4.1.7.RELEASE - compile - - - org.springframework - spring-aspects - 4.1.7.RELEASE - compile - commons-fileupload commons-fileupload 1.2.2 compile - - org.aspectj - aspectjtools - 1.8.0 - compile - org.hibernate hibernate-entitymanager 4.2.11.Final compile - - org.springframework - spring-context - 4.1.7.RELEASE - compile - - - org.springframework.integration - spring-integration-ip - 4.1.6.RELEASE - compile - commons-pool commons-pool @@ -148,9 +95,9 @@ compile - org.springframework - spring-tx - 4.1.7.RELEASE + org.springframework.integration + spring-integration-ip + 4.2.0.RELEASE compile @@ -183,12 +130,24 @@ 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 + org.hsqldb hsqldb @@ -204,7 +163,31 @@ org.springframework spring-aop - 4.1.7.RELEASE + 4.2.0.RELEASE + compile + + + org.springframework + spring-webmvc + 4.2.0.RELEASE + compile + + + org.springframework + spring-aspects + 4.2.0.RELEASE + compile + + + org.aspectj + aspectjtools + 1.8.4 + compile + + + org.springframework + spring-orm + 4.2.0.RELEASE compile @@ -219,12 +202,6 @@ 1.3 test - - org.springframework - spring-webmvc - 4.1.7.RELEASE - compile - commons-digester commons-digester @@ -234,7 +211,7 @@ org.springframework spring-jdbc - 4.1.7.RELEASE + 4.2.0.RELEASE compile @@ -256,4 +233,26 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + war + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /loanshark + + + + + diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index cb0ccd36..6812fab3 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 - spring-boot-starter-parent org.springframework.boot - 1.2.5.RELEASE + spring-boot-starter-parent + 1.3.0.M5 org.springframework.integration.samples stomp-chat @@ -57,21 +56,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration @@ -94,12 +78,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.springframework.integration spring-integration-websocket @@ -117,10 +95,10 @@ test - log4j - log4j - 1.2.17 - compile + org.springframework + spring-test + 4.2.0.RELEASE + test org.mockito @@ -129,4 +107,19 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index f7b492e7..26c3a234 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -52,38 +52,37 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-amqp - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-amqp + 4.2.0.RELEASE + compile + + + org.springframework.integration + spring-integration-stream + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -96,11 +95,12 @@ 1.9.5 test - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index d9471e8c..07bbc0b4 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 - spring-boot-starter-parent org.springframework.boot - 1.2.5.RELEASE + spring-boot-starter-parent + 1.3.0.M5 org.springframework.integration.samples barrier @@ -57,26 +56,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration - spring-integration-http - 4.2.0.BUILD-SNAPSHOT + spring-integration-core + 4.2.0.RELEASE compile @@ -85,24 +69,12 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-core - 4.2.0.BUILD-SNAPSHOT - compile - org.springframework.boot spring-boot-starter-test @@ -113,21 +85,27 @@ spring-boot-starter-integration compile + + org.springframework.integration + spring-integration-amqp + 4.2.0.RELEASE + compile + org.springframework.boot spring-boot-starter-web compile - log4j - log4j - 1.2.17 - compile + org.springframework + spring-test + 4.2.0.RELEASE + test org.springframework.integration - spring-integration-amqp - 4.2.0.BUILD-SNAPSHOT + spring-integration-http + 4.2.0.RELEASE compile @@ -137,4 +115,19 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 876fba0f..ee7b5d8c 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -52,18 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-core - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -72,18 +65,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 446d0663..9d5945da 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -52,18 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-core - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -78,18 +71,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -103,4 +96,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index e46babf0..384a1459 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -81,9 +68,15 @@ org.springframework.integration spring-integration-feed - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b27e15a0..188ef94c 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -81,9 +68,15 @@ org.springframework.integration spring-integration-file - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 96106ba9..5c1d6c4f 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,18 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 4.1.6.RELEASE - test - org.hamcrest hamcrest-all @@ -90,10 +71,16 @@ 2.4 compile + + org.springframework.integration + spring-integration-test + 4.2.0.RELEASE + test + org.springframework.integration spring-integration-ftp - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -102,6 +89,12 @@ 1.0.6 compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -121,4 +114,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 8bb6956b..ad5c67c2 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -52,18 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-core - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -72,18 +65,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index f960e090..75016c16 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 org.springframework.integration.samples http 4.1.0.BUILD-SNAPSHOT - war HTTP Sample HTTP Sample http://projects.spring.io/spring-integration @@ -53,58 +51,19 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /http - - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-mail - 4.1.6.RELEASE - compile - javax.mail javax.mail-api 1.5.2 compile - - org.springframework.integration - spring-integration-http - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -120,9 +79,15 @@ org.springframework spring-webmvc - 4.1.7.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -135,11 +100,45 @@ 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 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + war + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /http + + + + + diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 08780b51..517c9bc7 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - com.h2database @@ -72,30 +65,30 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-jdbc + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-jdbc - 4.1.6.RELEASE - compile - org.mockito mockito-core @@ -103,4 +96,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index c3ded599..d1a2e0f0 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,42 +59,48 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 4.1.6.RELEASE - test - org.hamcrest hamcrest-all 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.0 + 5.11.1 compile org.apache.activemq activemq-kahadb-store - 5.11.0 + 5.11.1 compile org.springframework.integration - spring-integration-jms - 4.1.6.RELEASE + spring-integration-stream + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -120,11 +119,12 @@ 1.9.5 test - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index ea1f8d2f..5598eeab 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -79,15 +66,27 @@ test - log4j - log4j - 1.2.17 + org.springframework.integration + spring-integration-jmx + 4.2.0.RELEASE compile org.springframework.integration - spring-integration-jmx - 4.1.6.RELEASE + spring-integration-stream + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + + + log4j + log4j + 1.2.17 compile @@ -96,11 +95,12 @@ 1.9.5 test - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 1264e086..8652a9aa 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.hibernate @@ -84,18 +77,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - - - org.springframework.integration - spring-integration-jpa - 4.1.6.RELEASE - compile - org.hamcrest hamcrest-all @@ -114,23 +95,42 @@ 2.0.0 compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework - spring-instrument - 4.1.7.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 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/kafka/README.md b/basic/kafka/README.md new file mode 100644 index 00000000..550d0e44 --- /dev/null +++ b/basic/kafka/README.md @@ -0,0 +1,39 @@ +Apache Kafka Sample +============== + +This example demonstrates the use Kafka **Outbound Channel Adapter** and **Message-Driven Channel Adapter**. + +It uses Java configuration for the adapters. + +## Running the sample + +Start Apache Zookeeper and Apache Kafka according to the documentation for the Apache Kafka project. + + $ gradlew :kafka:run + +This will package the application and run it using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) + +#### Using an IDE such as SpringSource Tool Suite™ (STS) + +In STS (Eclipse), go to package **org.springframework.integration.samples.kafka**, right-click **Application** and select **Run as** --> **Java Application** (or Spring Boot Application). + +### Output + +The application sends 10 messages (`foo0` ... `foo9`) to a kafka topic `si.topic` (which is created if necessary). + +The message-driven adapter receives the messages and places them in a `QueueChannel` which the application reads and +writes to stdout: + + GenericMessage [payload=foo0, headers={kafka_offset=21, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=22}] + GenericMessage [payload=foo1, headers={kafka_offset=22, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=23}] + GenericMessage [payload=foo2, headers={kafka_offset=23, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=24}] + GenericMessage [payload=foo3, headers={kafka_offset=24, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=25}] + GenericMessage [payload=foo4, headers={kafka_offset=25, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=26}] + GenericMessage [payload=foo5, headers={kafka_offset=26, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=27}] + GenericMessage [payload=foo6, headers={kafka_offset=27, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=28}] + GenericMessage [payload=foo7, headers={kafka_offset=28, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=29}] + GenericMessage [payload=foo8, headers={kafka_offset=29, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=30}] + GenericMessage [payload=foo9, headers={kafka_offset=30, kafka_messageKey=si.key, kafka_topic=si.topic, kafka_partitionId=0, kafka_nextOffset=31}] + +Notice that the offset header increases on each run (the topic is not removed, to demonstrate that the offset is retained +between executions). diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java new file mode 100644 index 00000000..3ed73df1 --- /dev/null +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -0,0 +1,224 @@ +/* + * Copyright 2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.kafka; + +import java.util.Collections; +import java.util.Map; +import java.util.Properties; + +import org.I0Itec.zkclient.ZkClient; +import org.apache.kafka.common.serialization.StringSerializer; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.SmartLifecycle; +import org.springframework.context.annotation.Bean; +import org.springframework.expression.common.LiteralExpression; +import org.springframework.integration.annotation.ServiceActivator; +import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.kafka.core.BrokerAddress; +import org.springframework.integration.kafka.core.BrokerAddressListConfiguration; +import org.springframework.integration.kafka.core.ConnectionFactory; +import org.springframework.integration.kafka.core.DefaultConnectionFactory; +import org.springframework.integration.kafka.core.Partition; +import org.springframework.integration.kafka.inbound.KafkaMessageDrivenChannelAdapter; +import org.springframework.integration.kafka.listener.KafkaMessageListenerContainer; +import org.springframework.integration.kafka.listener.KafkaTopicOffsetManager; +import org.springframework.integration.kafka.listener.OffsetManager; +import org.springframework.integration.kafka.outbound.KafkaProducerMessageHandler; +import org.springframework.integration.kafka.serializer.common.StringDecoder; +import org.springframework.integration.kafka.support.KafkaProducerContext; +import org.springframework.integration.kafka.support.ProducerConfiguration; +import org.springframework.integration.kafka.support.ProducerFactoryBean; +import org.springframework.integration.kafka.support.ProducerMetadata; +import org.springframework.integration.kafka.support.ZookeeperConnect; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.GenericMessage; + +import kafka.admin.AdminUtils; +import kafka.common.TopicExistsException; +import kafka.utils.ZKStringSerializer$; + +/** + * @author Gary Russell + * @since 4.2 + */ +@SpringBootApplication +public class Application { + + @Value("${kafka.topic}") + private String topic; + + @Value("${kafka.messageKey}") + private String messageKey; + + @Value("${kafka.broker.address}") + private String brokerAddress; + + @Value("${kafka.zookeeper.connect}") + private String zookeeperConnect; + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext context + = new SpringApplicationBuilder(Application.class) + .web(false) + .run(args); + MessageChannel toKafka = context.getBean("toKafka", MessageChannel.class); + for (int i = 0; i < 10; i++) { + toKafka.send(new GenericMessage<>("foo" + i)); + } + PollableChannel fromKafka = context.getBean("received", PollableChannel.class); + Message received = fromKafka.receive(10000); + while (received != null) { + System.out.println(received); + received = fromKafka.receive(10000); + } + context.close(); + System.exit(0); + } + + @ServiceActivator(inputChannel = "toKafka") + @Bean + public MessageHandler handler() throws Exception { + KafkaProducerMessageHandler handler = new KafkaProducerMessageHandler(producerContext()); + handler.setTopicExpression(new LiteralExpression(this.topic)); + handler.setMessageKeyExpression(new LiteralExpression(this.messageKey)); + return handler; + } + + @Bean + public ConnectionFactory kafkaBrokerConnectionFactory() throws Exception { + return new DefaultConnectionFactory(kafkaConfiguration()); + } + + @Bean + public org.springframework.integration.kafka.core.Configuration kafkaConfiguration() { + BrokerAddressListConfiguration configuration = new BrokerAddressListConfiguration( + BrokerAddress.fromAddress(this.brokerAddress)); + configuration.setSocketTimeout(500); + return configuration; + } + + @Bean + public KafkaProducerContext producerContext() throws Exception { + KafkaProducerContext kafkaProducerContext = new KafkaProducerContext(); + ProducerMetadata producerMetadata = new ProducerMetadata<>(this.topic, String.class, + String.class, new StringSerializer(), new StringSerializer()); + Properties props = new Properties(); + props.put("linger.ms", "1000"); + ProducerFactoryBean producer = + new ProducerFactoryBean<>(producerMetadata, this.brokerAddress, props); + ProducerConfiguration config = + new ProducerConfiguration<>(producerMetadata, producer.getObject()); + Map> producerConfigurationMap = + Collections.>singletonMap(this.topic, config); + kafkaProducerContext.setProducerConfigurations(producerConfigurationMap); + return kafkaProducerContext; + } + + @Bean + public OffsetManager offsetManager() { + return new KafkaTopicOffsetManager(new ZookeeperConnect(this.zookeeperConnect), "si-offsets"); + } + + @Bean + public KafkaMessageListenerContainer container(OffsetManager offsetManager) throws Exception { + final KafkaMessageListenerContainer kafkaMessageListenerContainer = new KafkaMessageListenerContainer( + kafkaBrokerConnectionFactory(), new Partition(this.topic, 0)); + kafkaMessageListenerContainer.setOffsetManager(offsetManager); + kafkaMessageListenerContainer.setMaxFetch(100); + kafkaMessageListenerContainer.setConcurrency(1); + return kafkaMessageListenerContainer; + } + + @Bean + public KafkaMessageDrivenChannelAdapter adapter(KafkaMessageListenerContainer container) { + KafkaMessageDrivenChannelAdapter kafkaMessageDrivenChannelAdapter = + new KafkaMessageDrivenChannelAdapter(container); + StringDecoder decoder = new StringDecoder(); + kafkaMessageDrivenChannelAdapter.setKeyDecoder(decoder); + kafkaMessageDrivenChannelAdapter.setPayloadDecoder(decoder); + kafkaMessageDrivenChannelAdapter.setOutputChannel(received()); + return kafkaMessageDrivenChannelAdapter; + } + + @Bean + public PollableChannel received() { + return new QueueChannel(); + } + + @Bean + public TopicCreator topicCreator() { + return new TopicCreator(this.topic, this.zookeeperConnect); + } + + public static class TopicCreator implements SmartLifecycle { + + private final String topic; + + private final String zkConnect; + + private volatile boolean running; + + public TopicCreator(String topic, String zkConnect) { + this.topic = topic; + this.zkConnect = zkConnect; + } + + @Override + public void start() { + ZkClient client = new ZkClient(this.zkConnect, 10000, 10000, ZKStringSerializer$.MODULE$); + try { + AdminUtils.createTopic(client, this.topic, 1, 1, new Properties()); + } + catch (TopicExistsException e) { + } + this.running = true; + } + + @Override + public void stop() { + } + + @Override + public boolean isRunning() { + return this.running; + } + + @Override + public int getPhase() { + return Integer.MIN_VALUE; + } + + @Override + public boolean isAutoStartup() { + return true; + } + + @Override + public void stop(Runnable callback) { + callback.run(); + } + + } + +} diff --git a/basic/kafka/src/main/resources/application.yml b/basic/kafka/src/main/resources/application.yml new file mode 100644 index 00000000..02f3a96c --- /dev/null +++ b/basic/kafka/src/main/resources/application.yml @@ -0,0 +1,7 @@ +kafka: + broker: + address: localhost:9092 + zookeeper: + connect: localhost:2181 + topic: si.topic + messageKey: si.key diff --git a/basic/kafka/src/main/resources/logback.xml b/basic/kafka/src/main/resources/logback.xml new file mode 100644 index 00000000..070671ef --- /dev/null +++ b/basic/kafka/src/main/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/basic/kafka/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java b/basic/kafka/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java new file mode 100644 index 00000000..3d693e9c --- /dev/null +++ b/basic/kafka/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java @@ -0,0 +1,39 @@ +package org.springframework.integration.samples.barrier; +/* + * Copyright 2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.integration.samples.kafka.Application; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Gary Russell + * @since 4.2 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = Application.class) +public class ApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 4ef0c97c..e15b6b2e 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -52,20 +52,7 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-mail - 4.1.6.RELEASE - compile - javax.mail javax.mail-api @@ -81,7 +68,7 @@ org.springframework spring-context - 4.1.7.RELEASE + 4.2.0.RELEASE compile @@ -90,18 +77,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -114,5 +101,18 @@ 1.9.5 test + + org.springframework.integration + spring-integration-mail + 4.2.0.RELEASE + compile + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index da2445e9..03c6af28 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -81,9 +68,15 @@ org.springframework.integration spring-integration-mongodb - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index d3461da6..5013def6 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -52,18 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-core - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -72,18 +65,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index aaaf91e5..4c7fe3b3 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,18 +59,24 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-stream + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -90,11 +89,12 @@ 1.9.5 test - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index b13459c1..f2417efe 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -52,55 +52,55 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-sftp - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.apache.sshd + sshd-core + 0.13.0 + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-sftp + 4.2.0.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.apache.sshd - sshd-core - 0.10.1 - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 1bf06bfa..72ecca0d 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -52,32 +52,13 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-amqp - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -86,10 +67,22 @@ org.springframework.integration - spring-integration-ip - 4.1.6.RELEASE + spring-integration-amqp + 4.2.0.RELEASE compile + + org.springframework.integration + spring-integration-ip + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -109,4 +102,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 77820fce..c50ee08d 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - commons-lang @@ -66,24 +59,12 @@ 2.6 compile - - org.springframework.integration - spring-integration-test - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -92,10 +73,22 @@ org.springframework.integration - spring-integration-ip - 4.1.6.RELEASE + spring-integration-test + 4.2.0.RELEASE compile + + org.springframework.integration + spring-integration-ip + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -109,4 +102,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 0301f45e..d0ed9f69 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -52,24 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-ws - 4.1.6.RELEASE - compile - - - org.springframework.integration - spring-integration-http - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -78,18 +65,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 4.1.6.RELEASE - test - org.hamcrest hamcrest-all @@ -98,22 +73,40 @@ org.springframework.integration - spring-integration-file - 4.1.6.RELEASE - compile + spring-integration-test + 4.2.0.RELEASE + test org.springframework spring-webmvc - 4.1.7.RELEASE + 4.2.0.RELEASE compile + + org.springframework.integration + spring-integration-file + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.2.0.RELEASE + compile + org.mockito mockito-core @@ -121,4 +114,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 75b672ea..3da3e3f4 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -79,10 +66,10 @@ test - org.springframework.integration - spring-integration-twitter - 4.1.6.RELEASE - compile + org.springframework + spring-test + 4.2.0.RELEASE + test log4j @@ -90,6 +77,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-twitter + 4.2.0.RELEASE + compile + org.mockito mockito-core @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 60b710be..e8347b65 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 - spring-boot-starter-parent org.springframework.boot - 1.2.5.RELEASE + spring-boot-starter-parent + 1.3.0.M5 org.springframework.integration.samples web-sockets @@ -57,21 +56,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.boot @@ -84,12 +68,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.springframework.integration spring-integration-websocket @@ -107,10 +85,10 @@ test - log4j - log4j - 1.2.17 - compile + org.springframework + spring-test + 4.2.0.RELEASE + test org.mockito @@ -119,4 +97,19 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index a668bdcc..fe29cb1c 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 org.springframework.integration.samples ws-inbound-gateway 4.1.0.BUILD-SNAPSHOT - war WS Inbound Gateway Sample WS Inbound Gateway Sample http://projects.spring.io/spring-integration @@ -53,32 +51,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /ws-inbound-gateway - - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-ws - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -87,12 +64,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -100,17 +71,23 @@ test - org.springframework - spring-webmvc - 4.1.7.RELEASE + org.springframework.integration + spring-integration-xml + 4.2.0.RELEASE compile - org.springframework.integration - spring-integration-xml - 4.1.6.RELEASE + org.springframework + spring-webmvc + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -124,4 +101,26 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + war + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /ws-inbound-gateway + + + + + diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index a6603367..6b2597c9 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -52,18 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-ws - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -72,18 +65,24 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-stream + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -96,11 +95,12 @@ 1.9.5 test - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 749cc2cd..714022ac 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -81,9 +68,15 @@ org.springframework.integration spring-integration-xml - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 43e0525f..11fb3e50 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -52,44 +52,37 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-xmpp - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-xmpp + 4.2.0.RELEASE + compile + org.mockito mockito-core @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/build.gradle b/build.gradle index 4f905c6f..303e79db 100644 --- a/build.gradle +++ b/build.gradle @@ -101,43 +101,36 @@ subprojects { subproject -> } } - if (subproject.plugins.hasPlugin('jetty')) { - packaging = 'war' - build { - plugins { - plugin { - groupId = 'org.mortbay.jetty' - artifactId = 'jetty-maven-plugin' - version = '8.1.14.v20131031' - configuration { - webAppConfig { - contextPath = '/' + subproject.name - } - } - } - } - } - } - if (subproject.plugins.hasPlugin('spring-boot')) { parent { groupId = 'org.springframework.boot' artifactId = 'spring-boot-starter-parent' version = springBootVersion } - - build { - plugins { - plugin { - groupId = 'org.springframework.boot' - artifactId = 'spring-boot-maven-plugin' - } - } + } + }.withXml { + if (subproject.plugins.hasPlugin('jetty')) { + asNode().appendNode('packaging', 'war') + asNode().appendNode('build') + .appendNode('plugins') + .appendNode('plugin').with { + appendNode('groupId', 'org.mortbay.jetty') + appendNode('artifactId', 'jetty-maven-plugin') + appendNode('version', '8.1.14.v20131031') + appendNode('configuration') + .appendNode('webAppConfig') + .appendNode('contextPath', '/' + subproject.name) } + } + if (subproject.plugins.hasPlugin('spring-boot')) { + asNode().appendNode('build').appendNode('plugins') + .appendNode('plugin').with { + appendNode('groupId', 'org.springframework.boot') + appendNode('artifactId', 'spring-boot-maven-plugin') + } + } + }.writeTo('pom.xml') } - - } - }.writeTo('pom.xml') } eclipse { @@ -155,7 +148,7 @@ subprojects { subproject -> toolVersion = "0.7.2.201409121644" } - sourceCompatibility = 1.6 + sourceCompatibility = 1.8 ext { activeMqVersion = '5.11.1' @@ -201,6 +194,7 @@ subprojects { subproject -> slf4jVersion = '1.7.11' springIntegrationVersion = '4.2.0.RELEASE' springIntegrationDslVersion = '1.1.0.RELEASE' + springIntegrationKafkaVersion = '1.2.2.BUILD-SNAPSHOT' springVersion = '4.2.0.RELEASE' springSecurityVersion = '4.0.2.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' @@ -214,8 +208,6 @@ subprojects { subproject -> // dependencies that are common across all java projects dependencies { - compile "log4j:log4j:$log4jVersion" - testCompile("junit:junit:$junitVersion") { exclude group: 'org.hamcrest' } @@ -284,6 +276,7 @@ project('advanced-testing-examples') { compile "javax.jms:jms-api:$jmsApiVersion" compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -292,6 +285,7 @@ project('dynamic-ftp') { dependencies { compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -305,6 +299,7 @@ project('cafe-si') { dependencies { compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -314,6 +309,7 @@ project('cafe-amqp') { dependencies { compile project(":cafe-si") compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -327,6 +323,7 @@ project('cafe-jms') { exclude group: "org.springframework" } compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -341,6 +338,7 @@ project('cafe-scripted') { compile "org.jruby:jruby:$jrubyVersion" compile "org.python:jython-standalone:$jythonVersion" compile "org.codehaus.groovy:groovy-all:$groovyVersion" + compile "log4j:log4j:$log4jVersion" } task runCafeDemoApp(type: JavaExec) { @@ -364,6 +362,7 @@ project('loan-broker') { dependencies { compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } task runLoanBrokerSharkDetectorDemo(type: JavaExec) { @@ -405,6 +404,7 @@ 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" } } @@ -415,6 +415,7 @@ project('amqp') { dependencies { compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } task runSimple(type: JavaExec) { @@ -455,6 +456,11 @@ project('barrier') { springBoot { mainClass = 'org.springframework.integration.samples.barrier.Application' } + + task run(type: JavaExec) { + main 'org.springframework.integration.samples.barrier.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('control-bus') { @@ -462,6 +468,7 @@ project('control-bus') { dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -475,6 +482,7 @@ project('enricher') { dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" compile "com.h2database:h2:$h2Version" + compile "log4j:log4j:$log4jVersion" } } @@ -483,6 +491,7 @@ project('feed') { dependencies { compile "org.springframework.integration:spring-integration-feed:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -491,6 +500,7 @@ project('file') { dependencies { compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -502,6 +512,7 @@ project('ftp') { compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + compile "log4j:log4j:$log4jVersion" testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" } @@ -516,6 +527,7 @@ project('helloworld') { dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } task runHelloWorldApp(type: JavaExec) { @@ -546,10 +558,35 @@ project('http') { compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "log4j:log4j:$log4jVersion" } } +project('kafka') { + description = 'Apache Kafka Sample' + + apply plugin: 'spring-boot' + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { + exclude group: 'org.slf4j' + } + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + + springBoot { + mainClass = 'org.springframework.integration.samples.kafka.Application' + } + + task run(type: JavaExec) { + main 'org.springframework.integration.samples.kafka.Application' + classpath = sourceSets.main.runtimeClasspath + } +} project('si4demo') { description = 'Java Configuration/DSL Sample' @@ -616,6 +653,7 @@ project('jdbc') { dependencies { compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" compile "com.h2database:h2:$h2Version" + compile "log4j:log4j:$log4jVersion" } } @@ -634,6 +672,7 @@ project('jms') { compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" } + compile "log4j:log4j:$log4jVersion" testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" } @@ -645,6 +684,7 @@ project('jmx') { dependencies { compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -661,6 +701,7 @@ project('jpa') { compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" compile "commons-lang:commons-lang:$commonsLangVersion" + compile "log4j:log4j:$log4jVersion" runtime "org.springframework:spring-instrument:$springVersion" runtime "org.apache.openjpa:openjpa:$openJpaVersion" @@ -686,6 +727,7 @@ project('mail') { compile "org.springframework:spring-context:$springVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" compile "com.sun.mail:mailapi:$javaxMailVersion" + compile "log4j:log4j:$log4jVersion" } task runGmailInboundPop3AdapterTestApp(type: JavaExec) { @@ -705,6 +747,7 @@ project('mongodb') { dependencies { compile "org.springframework.integration:spring-integration-mongodb:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } task runMongoDbInboundAdapterDemo(type: JavaExec) { @@ -723,6 +766,7 @@ project('oddeven') { dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } task runCronOddEvenDemo(type: JavaExec) { @@ -741,6 +785,7 @@ project('quote') { dependencies { compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -750,6 +795,7 @@ project('sftp') { dependencies { compile "org.springframework.integration:spring-integration-sftp:$springIntegrationVersion" compile "org.apache.sshd:sshd-core:$apacheSshdVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -764,6 +810,7 @@ project('tcp-amqp') { 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" } } @@ -778,6 +825,7 @@ project('tcp-client-server') { compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" compile "commons-lang:commons-lang:$commonsLangVersion" compile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -793,6 +841,7 @@ project('testing-examples') { compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" compile "org.springframework:spring-webmvc:$springVersion" + compile "log4j:log4j:$log4jVersion" testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" } @@ -803,6 +852,7 @@ project('twitter') { dependencies { compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } test { @@ -820,6 +870,7 @@ project('ws-inbound-gateway') { compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" compile "org.springframework:spring-webmvc:$springVersion" + compile "log4j:log4j:$log4jVersion" } test { @@ -838,6 +889,7 @@ project('ws-outbound-gateway') { compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" // compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' + compile "log4j:log4j:$log4jVersion" } } @@ -850,6 +902,7 @@ project('xml') { dependencies { compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -858,6 +911,7 @@ project('xmpp') { dependencies { compile "org.springframework.integration:spring-integration-xmpp:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } test { @@ -874,6 +928,7 @@ project('async-gateway') { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" compile "io.projectreactor:reactor-stream:$reactorVersion" compile "io.projectreactor.spring:reactor-spring-context:$reactorVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -886,6 +941,7 @@ project('dynamic-poller') { dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -894,6 +950,7 @@ project('errorhandling') { dependencies { compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -902,6 +959,7 @@ project('file-processing') { dependencies { compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -918,6 +976,7 @@ project('mail-attachments') { compile "javax.mail:javax.mail-api:$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" testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" @@ -940,6 +999,7 @@ project('monitoring') { compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" compile "org.springframework:spring-webmvc:$springVersion" compile "javax.servlet:jstl:$jstlVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -955,6 +1015,7 @@ project('multipart-http') { compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -976,6 +1037,7 @@ project('rest-http') { compile "org.springframework.security:spring-security-web:$springSecurityVersion" compile "org.springframework.security:spring-security-config:$springSecurityVersion" compile "org.jasypt:jasypt:$jasyptVersion" + compile "log4j:log4j:$log4jVersion" } test { @@ -996,6 +1058,7 @@ project('retry-and-more') { exclude group: 'org.hamcrest' } compile "org.hamcrest:hamcrest-all:$hamcrestVersion" + compile "log4j:log4j:$log4jVersion" } task runCircuitBreakerDemo(type: JavaExec) { @@ -1034,6 +1097,7 @@ project('splitter-aggregator-reaper') { dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" compile "javax.inject:javax.inject:$javaxInjectVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -1048,6 +1112,7 @@ project('stored-procedures-derby') { dependencies { compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" compile "org.apache.derby:derby:$derbyVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -1066,6 +1131,7 @@ project('stored-procedures-oracle') { compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" //TODO Uncomment it when the ojdbc6 artifact is available in the mavenLocal() // compile "com.oracle:ojdbc6:$oracleDriverVersion" + compile "log4j:log4j:$log4jVersion" } test { @@ -1084,6 +1150,7 @@ project('stored-procedures-ms') { compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" compile "net.sourceforge.jtds:jtds:$jtdsVersion" compile "c3p0:c3p0:$c3p0Version" + compile "log4j:log4j:$log4jVersion" } test { @@ -1103,6 +1170,7 @@ project('stored-procedures-postgresql') { compile "postgresql:postgresql:$postgresVersion" compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" compile "commons-pool:commons-pool:$commonsPoolVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -1111,6 +1179,7 @@ project('tcp-client-server-multiplex') { dependencies { compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "log4j:log4j:$log4jVersion" testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" } @@ -1127,6 +1196,7 @@ project('travel') { compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" compile "org.springframework:spring-web:$springVersion" + compile "log4j:log4j:$log4jVersion" } } @@ -1141,6 +1211,7 @@ project('tx-synch') { compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" compile "com.h2database:h2:$h2Version" + compile "log4j:log4j:$log4jVersion" } } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 3c3bd72d..e63775fd 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 - spring-boot-starter-parent org.springframework.boot - 1.2.5.RELEASE + spring-boot-starter-parent + 1.3.0.M5 org.springframework.integration.samples cafe-dsl @@ -57,40 +56,37 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + org.springframework.integration + spring-integration-core + 4.2.0.RELEASE + compile + + + io.projectreactor + reactor-stream + 2.0.5.RELEASE + compile + junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration.samples + cafe-si + 4.1.0.BUILD-SNAPSHOT + compile + com.google.guava guava @@ -108,33 +104,43 @@ compile - org.springframework.integration.samples - cafe-si - 4.1.0.BUILD-SNAPSHOT - compile - - - log4j - log4j - 1.2.17 + io.projectreactor.spring + reactor-spring-context + 2.0.5.RELEASE compile org.springframework.integration spring-integration-java-dsl - 1.0.2.RELEASE + 1.1.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + org.mockito mockito-core 1.9.5 test - - org.springframework.integration - spring-integration-core - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/dsl/pom.xml b/dsl/pom.xml index 18117447..6de92b80 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -50,13 +50,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -64,12 +57,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -77,10 +64,10 @@ test - log4j - log4j - 1.2.17 - compile + org.springframework + spring-test + 4.2.0.RELEASE + test org.mockito @@ -89,4 +76,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 9ae9ca49..cd4448d9 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 - spring-boot-starter-parent org.springframework.boot - 1.2.5.RELEASE + spring-boot-starter-parent + 1.3.0.M5 org.springframework.integration.samples si4demo @@ -57,21 +56,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - javax.mail @@ -97,29 +81,23 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.springframework.boot spring-boot-starter-web compile + + org.springframework.integration + spring-integration-java-dsl + 1.1.0.RELEASE + compile + com.rometools rome 1.5.0 compile - - org.springframework.integration - spring-integration-java-dsl - 1.0.2.RELEASE - compile - com.sun.mail imap @@ -149,10 +127,10 @@ compile - log4j - log4j - 1.2.17 - compile + org.springframework + spring-test + 4.2.0.RELEASE + test org.springframework.integration @@ -171,4 +149,19 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 083a47e8..944f9029 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -52,24 +52,17 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-core - 4.1.6.RELEASE + 4.2.0.RELEASE compile - org.projectreactor.spring - reactor-spring-context - 1.1.3.RELEASE + io.projectreactor + reactor-stream + 2.0.5.RELEASE compile @@ -78,18 +71,24 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + io.projectreactor.spring + reactor-spring-context + 2.0.5.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -103,4 +102,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index a43467b1..293af061 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -52,18 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-core - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -72,18 +65,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 9fa77eac..3723f57e 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,18 +59,24 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-stream + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -90,11 +89,12 @@ 1.9.5 test - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index abaa5003..d1b866a9 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -81,9 +68,15 @@ org.springframework.integration spring-integration-file - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 605d694c..01c73146 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -52,20 +52,7 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-mail - 4.1.6.RELEASE - compile - javax.mail javax.mail-api @@ -84,42 +71,42 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 4.1.6.RELEASE - test - org.hamcrest hamcrest-all 1.3 test - - org.springframework.integration - spring-integration-file - 4.1.6.RELEASE - compile - commons-io commons-io 2.4 compile + + org.springframework.integration + spring-integration-test + 4.2.0.RELEASE + test + org.subethamail subethasmtp-wiser 1.2 test + + org.springframework.integration + spring-integration-file + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -132,5 +119,18 @@ 1.9.5 test + + org.springframework.integration + spring-integration-mail + 4.2.0.RELEASE + compile + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 28aaa2bc..fff2e03e 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 org.springframework.integration.samples monitoring 4.1.0.BUILD-SNAPSHOT - war Monitoring Application Monitoring Application http://projects.spring.io/spring-integration @@ -53,27 +51,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /monitoring - - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - javax.servlet @@ -87,12 +64,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -101,22 +72,28 @@ org.springframework.integration - spring-integration-groovy - 4.1.6.RELEASE + spring-integration-jmx + 4.2.0.RELEASE compile org.springframework spring-webmvc - 4.1.7.RELEASE + 4.2.0.RELEASE compile org.springframework.integration - spring-integration-twitter - 4.1.6.RELEASE + spring-integration-groovy + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -125,8 +102,8 @@ org.springframework.integration - spring-integration-jmx - 4.1.6.RELEASE + spring-integration-twitter + 4.2.0.RELEASE compile @@ -136,4 +113,26 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + war + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /monitoring + + + + + diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index f995856f..26646939 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 org.springframework.integration.samples multipart-http 4.1.0.BUILD-SNAPSHOT - war HTTP Multipart Demo HTTP Multipart Demo http://projects.spring.io/spring-integration @@ -53,46 +51,13 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /multipart-http - - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-http - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -108,9 +73,15 @@ org.springframework spring-webmvc - 4.1.7.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -123,6 +94,12 @@ 1.2.2 compile + + org.springframework.integration + spring-integration-http + 4.2.0.RELEASE + compile + com.fasterxml.jackson.core jackson-databind @@ -136,4 +113,26 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + war + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /multipart-http + + + + + diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 3d61c0af..1bdf9e51 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 org.springframework.integration.samples rest-http 4.1.0.BUILD-SNAPSHOT - war Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo http://projects.spring.io/spring-integration @@ -53,32 +51,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /rest-http - - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework - spring-oxm - 4.1.7.RELEASE + spring-context + 4.2.0.RELEASE compile @@ -87,40 +64,22 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.springframework spring-aop - 4.1.7.RELEASE - compile - - - org.springframework.security - spring-security-web - 3.2.4.RELEASE + 4.2.0.RELEASE compile org.springframework - spring-context - 4.1.7.RELEASE + spring-webmvc + 4.2.0.RELEASE compile org.springframework.security spring-security-config - 3.2.4.RELEASE - compile - - - org.springframework.integration - spring-integration-http - 4.1.6.RELEASE + 4.0.2.RELEASE compile @@ -131,8 +90,8 @@ org.springframework - spring-webmvc - 4.1.7.RELEASE + spring-oxm + 4.2.0.RELEASE compile @@ -143,15 +102,15 @@ org.springframework - spring-tx - 4.1.7.RELEASE + spring-jdbc + 4.2.0.RELEASE compile org.springframework - spring-jdbc - 4.1.7.RELEASE - compile + spring-test + 4.2.0.RELEASE + test log4j @@ -159,6 +118,24 @@ 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 @@ -172,4 +149,26 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + war + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /rest-http + + + + + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 0189948a..a9904e93 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -52,32 +52,13 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - org.springframework.integration - spring-integration-amqp - 4.1.6.RELEASE - compile - junit junit 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -86,16 +67,34 @@ org.springframework.integration - spring-integration-file - 4.1.6.RELEASE + spring-integration-amqp + 4.2.0.RELEASE compile org.springframework.integration spring-integration-ftp - 4.1.6.RELEASE + 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 + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -108,11 +107,12 @@ 1.9.5 compile - - org.springframework.integration - spring-integration-stream - 4.1.6.RELEASE - compile - + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 691eb5fc..9e3e3a2d 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -52,18 +52,11 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-core - 4.1.6.RELEASE + 4.2.0.RELEASE compile @@ -72,12 +65,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -90,6 +77,12 @@ 1 compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -103,4 +96,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 15b8c811..c7bc0496 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.apache.derby derby @@ -85,15 +72,21 @@ test - log4j - log4j - 1.2.17 + org.springframework.integration + spring-integration-jdbc + 4.2.0.RELEASE compile - org.springframework.integration - spring-integration-jdbc - 4.1.6.RELEASE + org.springframework + spring-test + 4.2.0.RELEASE + test + + + log4j + log4j + 1.2.17 compile @@ -103,4 +96,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index b7662bb0..a1f3e77e 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - c3p0 @@ -78,30 +71,30 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-jdbc + 4.2.0.RELEASE + compile + + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-jdbc - 4.1.6.RELEASE - compile - org.mockito mockito-core @@ -109,4 +102,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 18978ff3..2028a4ef 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -79,15 +66,21 @@ test - log4j - log4j - 1.2.17 + org.springframework.integration + spring-integration-jdbc + 4.2.0.RELEASE compile - org.springframework.integration - spring-integration-jdbc - 4.1.6.RELEASE + org.springframework + spring-test + 4.2.0.RELEASE + test + + + log4j + log4j + 1.2.17 compile @@ -97,4 +90,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 94224f7e..d606fd06 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,12 +59,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -84,24 +71,30 @@ 1.5.4 compile + + org.springframework.integration + spring-integration-jdbc + 4.2.0.RELEASE + compile + commons-dbcp commons-dbcp 1.2.2 compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-jdbc - 4.1.6.RELEASE - compile - org.mockito mockito-core @@ -115,4 +108,11 @@ compile + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 191a82b6..71b923c7 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - junit @@ -66,30 +59,30 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 4.1.6.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-test + 4.2.0.RELEASE + test + org.springframework.integration spring-integration-ip - 4.1.6.RELEASE + 4.2.0.RELEASE compile + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -103,4 +96,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 4be66826..765dfc1f 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -52,24 +52,17 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - org.springframework.integration spring-integration-ws - 4.1.6.RELEASE + 4.2.0.RELEASE compile - org.springframework.integration - spring-integration-http - 4.1.6.RELEASE + org.springframework + spring-web + 4.2.0.RELEASE compile @@ -78,18 +71,18 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.2.0.RELEASE + test + log4j log4j @@ -97,9 +90,9 @@ compile - org.springframework - spring-web - 4.1.7.RELEASE + org.springframework.integration + spring-integration-http + 4.2.0.RELEASE compile @@ -109,4 +102,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index cc715d8c..f4bc9c13 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -52,13 +52,6 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - com.h2database @@ -72,12 +65,6 @@ 4.11 test - - org.springframework - spring-test - 4.1.7.RELEASE - test - org.hamcrest hamcrest-all @@ -86,22 +73,28 @@ org.springframework.integration - spring-integration-file - 4.1.6.RELEASE + 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 + test + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-jdbc - 4.1.6.RELEASE - compile - org.mockito mockito-core @@ -109,4 +102,11 @@ test + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + +