diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index a4235a22..5a9d5a95 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -62,13 +62,13 @@ org.springframework.integration spring-integration-jms - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-groovy - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -82,6 +82,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -94,6 +100,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 76f0ec7a..78778e9e 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ftp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 031173bb..3613af9d 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -65,7 +65,7 @@ org.springframework.integration spring-integration-ip - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -73,6 +73,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -85,6 +91,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 96cfc482..0a49f806 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-groovy - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-rmi - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-jmx - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -106,6 +106,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -118,6 +124,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 2760158a..9d186f10 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -62,7 +62,7 @@ org.springframework.integration spring-integration-amqp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index cea4e5d0..55bebf9c 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -70,11 +70,17 @@ activemq-kahadb-store 5.13.4 compile + + + * + org.springframework + + org.springframework.integration spring-integration-jms - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -94,6 +100,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -106,6 +118,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index ddb23712..54c3fb26 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 40e913a7..0c814252 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -70,25 +70,25 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-ftp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-mail - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -108,6 +108,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -120,6 +126,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework @@ -135,7 +147,7 @@ org.springframework.integration spring-integration-test - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 test diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index bb0415a4..0423ff83 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 06deb34e..0e3bdc6e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -55,7 +55,7 @@ org.springframework.integration spring-integration-ip - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -219,6 +219,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -231,6 +237,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c4df137e..8ae32244 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -82,6 +82,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -94,6 +100,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/amqp-affinity/pom.xml b/basic/amqp-affinity/pom.xml index fb5b8887..dc0c2b4c 100644 --- a/basic/amqp-affinity/pom.xml +++ b/basic/amqp-affinity/pom.xml @@ -56,6 +56,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -68,6 +74,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index cbf3bd16..c93e00a1 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-amqp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 2e3486da..8787840a 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -75,19 +75,19 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-amqp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -95,6 +95,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -107,6 +113,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index a3bae036..8908bb2a 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 5103029c..a0f1132c 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 6e4076b5..972b7842 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-feed - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 451b3e40..f855b2c0 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-file - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 56f45029..36097699 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ftp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -68,7 +68,7 @@ org.apache.ftpserver ftpserver-core - 1.0.6 + 1.1.0 compile @@ -88,6 +88,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -100,6 +106,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework @@ -116,7 +128,7 @@ org.springframework.integration spring-integration-test - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 test diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 09ed9995..ea48f85b 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/http-boot/pom.xml b/basic/http-boot/pom.xml index 5ce20ce0..de729882 100644 --- a/basic/http-boot/pom.xml +++ b/basic/http-boot/pom.xml @@ -56,6 +56,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -68,6 +74,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a62ee13f..35c98d2a 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -55,13 +55,13 @@ org.springframework.integration spring-integration-http - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-mail - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -105,6 +105,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -117,6 +123,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index f6cc1b83..ba86d482 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 2bdac5a2..1a082677 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -62,13 +62,13 @@ org.springframework.integration spring-integration-jms - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -82,6 +82,12 @@ activemq-kahadb-store 5.13.4 compile + + + * + org.springframework + + log4j @@ -94,6 +100,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -106,6 +118,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework @@ -116,7 +134,7 @@ org.springframework.integration spring-integration-test - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 test diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 2907fa46..8242f9a7 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jmx - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index fd8d6afd..4e889dc5 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -62,62 +62,30 @@ spring-boot-starter-data-jpa compile - - jboss-interceptors-api_1.1_spec - org.jboss.spec.javax.interceptor - - - jsr250-api - javax.annotation - - - cdi-api - javax.enterprise - - - el-api - javax.el - - - javax.inject - javax.inject - commons-logging commons-logging + + jboss-transaction-api_1.2_spec + org.jboss.spec.javax.transaction + org.springframework.integration spring-integration-jpa - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile - - jboss-interceptors-api_1.1_spec - org.jboss.spec.javax.interceptor - - - jsr250-api - javax.annotation - - - cdi-api - javax.enterprise - - - el-api - javax.el - - - javax.inject - javax.inject - commons-logging commons-logging + + jboss-transaction-api_1.2_spec + org.jboss.spec.javax.transaction + @@ -126,30 +94,14 @@ 1.3.175 compile - - jboss-interceptors-api_1.1_spec - org.jboss.spec.javax.interceptor - - - jsr250-api - javax.annotation - - - cdi-api - javax.enterprise - - - el-api - javax.el - - - javax.inject - javax.inject - commons-logging commons-logging + + jboss-transaction-api_1.2_spec + org.jboss.spec.javax.transaction + @@ -158,30 +110,14 @@ 5.0.0.BUILD-SNAPSHOT runtime - - jboss-interceptors-api_1.1_spec - org.jboss.spec.javax.interceptor - - - jsr250-api - javax.annotation - - - cdi-api - javax.enterprise - - - el-api - javax.el - - - javax.inject - javax.inject - commons-logging commons-logging + + jboss-transaction-api_1.2_spec + org.jboss.spec.javax.transaction + @@ -190,30 +126,14 @@ 1.0.0.Final runtime - - jboss-interceptors-api_1.1_spec - org.jboss.spec.javax.interceptor - - - jsr250-api - javax.annotation - - - cdi-api - javax.enterprise - - - el-api - javax.el - - - javax.inject - javax.inject - commons-logging commons-logging + + jboss-transaction-api_1.2_spec + org.jboss.spec.javax.transaction + @@ -222,30 +142,14 @@ 2.4.2 runtime - - jboss-interceptors-api_1.1_spec - org.jboss.spec.javax.interceptor - - - jsr250-api - javax.annotation - - - cdi-api - javax.enterprise - - - el-api - javax.el - - - javax.inject - javax.inject - commons-logging commons-logging + + jboss-transaction-api_1.2_spec + org.jboss.spec.javax.transaction + @@ -253,6 +157,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -265,6 +175,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 48755eef..f9e3b586 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -67,11 +67,17 @@ spring-integration-kafka 3.0.0.BUILD-SNAPSHOT compile + + + * + org.slf4j + + org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -91,6 +97,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -103,6 +115,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 4e2b72f8..6c01b001 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-mail - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -88,6 +88,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -100,6 +106,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 4fcda35c..92969c88 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-mongodb - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index c92d8fd1..7131d48f 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -65,13 +65,13 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-mqtt - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -79,6 +79,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -91,6 +97,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 523b5b73..f3e8797f 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index cd20e8e3..909b6b3f 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 16e7cf41..4722feef 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-sftp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.apache.sshd sshd-core - 0.14.0 + 1.4.0 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 39059be7..f36af3ed 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -65,7 +65,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -79,6 +79,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -91,6 +97,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index bef17cc0..5ef2e5e7 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-amqp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-ip - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -88,6 +88,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -100,6 +106,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 430493f4..5933c131 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -68,7 +68,7 @@ org.springframework.integration spring-integration-test - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -82,6 +82,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -94,6 +100,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 088ae546..d1ba175d 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -56,19 +56,19 @@ org.springframework.integration spring-integration-file - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-ws - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -88,6 +88,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -100,6 +106,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework @@ -110,7 +122,7 @@ org.springframework.integration spring-integration-test - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 test diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 82c2ad66..174896e8 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-twitter - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 2e1b9a3b..6015f3a8 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -72,6 +72,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -84,6 +90,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index ea063039..1a85cb0b 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -55,13 +55,13 @@ org.springframework.integration spring-integration-xml - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-ws - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -81,6 +81,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -93,6 +99,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index d11e702f..8fc0f960 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-ws - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 72efa549..ef384440 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xml - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 02b273f8..c27a73b2 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xmpp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/build.gradle b/build.gradle index 4aa85468..c07b8c1d 100644 --- a/build.gradle +++ b/build.gradle @@ -42,96 +42,98 @@ subprojects { subproject -> apply plugin: 'idea' apply plugin: 'maven' - task generatePom << { - pom { - project { - name = project.description - description = project.description - url = linkHomepage + task generatePom { + doLast { + pom { + project { + name = project.description + description = project.description + url = linkHomepage - organization { - name = 'SpringIO' - url = 'https://spring.io' - } + organization { + name = 'SpringIO' + url = 'https://spring.io' + } - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - - scm { - url = linkScmUrl - connection = 'scm:git:' + linkScmConnection - developerConnection = 'scm:git:' + linkScmDevConnection - } - - developers { - developer { - id = 'garyrussell' - name = 'Gary Russell' - email = 'grussell@pivotal.io' - roles = ["project lead"] - } - developer { - id = 'markfisher' - name = 'Mark Fisher' - email = 'mfisher@pivotal.io' - roles = ["project founder and lead emeritus"] - } - developer { - id = 'ghillert' - name = 'Gunnar Hillert' - email = 'ghillert@pivotal.io' - } - developer { - id = 'abilan' - name = 'Artem Bilan' - email = 'abilan@pivotal.io' - } - } - - if (subproject.plugins.hasPlugin('java')) { - repositories { - repository { - id = 'repo.spring.io.milestone' - name = 'Spring Framework Maven Milestone Repository' - url = 'https://repo.spring.io/libs-milestone' + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' } } - } - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - parent { - groupId = 'org.springframework.boot' - artifactId = 'spring-boot-starter-parent' - version = springBootVersion + scm { + url = linkScmUrl + connection = 'scm:git:' + linkScmConnection + developerConnection = 'scm:git:' + linkScmDevConnection } - } - }.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) + + developers { + developer { + id = 'garyrussell' + name = 'Gary Russell' + email = 'grussell@pivotal.io' + roles = ["project lead"] + } + developer { + id = 'markfisher' + name = 'Mark Fisher' + email = 'mfisher@pivotal.io' + roles = ["project founder and lead emeritus"] + } + developer { + id = 'ghillert' + name = 'Gunnar Hillert' + email = 'ghillert@pivotal.io' + } + developer { + id = 'abilan' + name = 'Artem Bilan' + email = 'abilan@pivotal.io' + } } - } - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - asNode().appendNode('build').appendNode('plugins') - .appendNode('plugin').with { - appendNode('groupId', 'org.springframework.boot') - appendNode('artifactId', 'spring-boot-maven-plugin') + + if (subproject.plugins.hasPlugin('java')) { + repositories { + repository { + id = 'repo.spring.io.milestone' + name = 'Spring Framework Maven Milestone Repository' + url = 'https://repo.spring.io/libs-milestone' } - } - }.writeTo('pom.xml') + } + } + + if (subproject.plugins.hasPlugin('org.springframework.boot')) { + parent { + groupId = 'org.springframework.boot' + artifactId = 'spring-boot-starter-parent' + version = springBootVersion + } + } + }.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('org.springframework.boot')) { + asNode().appendNode('build').appendNode('plugins') + .appendNode('plugin').with { + appendNode('groupId', 'org.springframework.boot') + appendNode('artifactId', 'spring-boot-maven-plugin') + } + } + }.writeTo('pom.xml') + } } } @@ -145,9 +147,10 @@ subprojects { subproject -> apply plugin: 'java' apply plugin: 'jacoco' + apply plugin: 'io.spring.dependency-management' jacoco { - toolVersion = "0.7.7.201606060606" + toolVersion = "0.7.8" } compileJava { @@ -198,12 +201,12 @@ subprojects { subproject -> postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.11' - springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT' + springIntegrationVersion = '5.0.0.M3' springIntegrationKafkaVersion = '3.0.0.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '2.0.0.BUILD-SNAPSHOT' springVersion = '5.0.0.BUILD-SNAPSHOT' - springSecurityVersion = '4.2.0.RELEASE' + springSecurityVersion = '4.2.2.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' @@ -246,22 +249,24 @@ subprojects { subproject -> } } - task checkTestConfigs << { - def configFiles = [] - sourceSets.test.allSource.srcDirs.each { - fileTree(it).include('**/*.xml').exclude('**/log4j.xml').each { configFile -> - def configXml = new XmlParser(false, false).parse(configFile) + task checkTestConfigs { + doLast { + def configFiles = [] + sourceSets.test.allSource.srcDirs.each { + fileTree(it).include('**/*.xml').exclude('**/log4j.xml').each { configFile -> + def configXml = new XmlParser(false, false).parse(configFile) - if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) { - configFiles << configFile + if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) { + configFiles << configFile + } } } - } - if (configFiles) { - throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' + - configFiles.collect { relativePath(it) }.join('\n') + - '\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' + - 'on different versions of dependencies.') + if (configFiles) { + throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' + + configFiles.collect { relativePath(it) }.join('\n') + + '\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' + + 'on different versions of dependencies.') + } } } @@ -464,8 +469,8 @@ project('barrier') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.barrier.Application' + bootRun { + main = 'org.springframework.integration.samples.barrier.Application' } task run(type: JavaExec) { @@ -589,8 +594,8 @@ project('splunk') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.splunk.Application' + bootRun { + main = 'org.springframework.integration.samples.splunk.Application' } task run(type: JavaExec) { @@ -617,8 +622,8 @@ project('kafka') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.kafka.Application' + bootRun { + main = 'org.springframework.integration.samples.kafka.Application' } task run(type: JavaExec) { @@ -638,8 +643,8 @@ project('mqtt') { compile "org.springframework.integration:spring-integration-mqtt:$springIntegrationVersion" } - springBoot { - mainClass = 'org.springframework.integration.samples.mqtt.Application' + bootRun { + main = 'org.springframework.integration.samples.mqtt.Application' } task run(type: JavaExec) { @@ -672,8 +677,8 @@ project('si4demo') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.si4demo.dsl.Application' + bootRun { + main = 'org.springframework.integration.samples.si4demo.dsl.Application' } tasks.withType(JavaExec) { @@ -694,8 +699,8 @@ project('cafe-dsl') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' + bootRun { + main = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' } task run(type: JavaExec) { @@ -777,8 +782,8 @@ project('jpa') { //Suppress openjpa annotation processor warnings compileTestJava.options.compilerArgs = ["${xLintArg},-processing"] - springBoot { - mainClass = 'org.springframework.integration.samples.jpa.Main' + bootRun { + main = 'org.springframework.integration.samples.jpa.Main' } tasks.withType(JavaExec) { @@ -1295,8 +1300,8 @@ project('web-sockets') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.websocket.standard.server.Application' + bootRun { + main = 'org.springframework.integration.samples.websocket.standard.server.Application' } tasks.withType(JavaExec) { @@ -1318,8 +1323,8 @@ project('stomp-chat') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.chat.stomp.server.Application' + bootRun { + main = 'org.springframework.integration.samples.chat.stomp.server.Application' } tasks.withType(JavaExec) { @@ -1339,8 +1344,8 @@ project('kafka-dsl') { compile "log4j:log4j:$log4jVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.dsl.kafka.Application' + bootRun { + main = 'org.springframework.integration.samples.dsl.kafka.Application' } task run(type: JavaExec) { @@ -1372,8 +1377,8 @@ project('file-split-ftp') { testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" } - springBoot { - mainClass = 'org.springframework.integration.samples.filesplit.Application' + bootRun { + main = 'org.springframework.integration.samples.filesplit.Application' } task run(type: JavaExec) { @@ -1394,8 +1399,8 @@ project('dynamic-tcp-client') { testCompile 'org.springframework.boot:spring-boot-starter-test' } - springBoot { - mainClass = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' + bootRun { + main = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' } task run(type: JavaExec) { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index edeb1464..5e36a846 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -85,6 +85,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -97,6 +103,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 6dad0017..3aac56a6 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -65,7 +65,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -85,6 +85,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -97,6 +103,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/dsl/pom.xml b/dsl/pom.xml index b6b27e08..78ad3341 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -56,6 +56,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -68,6 +74,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 19c3d240..74bec3ce 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -110,6 +110,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -122,6 +128,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java index 3d3ef955..23d1ea67 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2017 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. @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.si4demo.springone.d; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; @@ -44,7 +46,7 @@ public class DBoot { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = new SpringApplicationBuilder(DBoot.class) - .web(false) + .web(WebApplicationType.NONE) .run(args); System.out.println(ctx.getBean(FooService.class).foo("foo")); ctx.close(); diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java index b071d388..fd94d288 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2017 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. @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.si4demo.springone.e; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; @@ -40,7 +42,7 @@ public class EDSL { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = new SpringApplicationBuilder(EDSL.class) - .web(false) + .web(WebApplicationType.NONE) .run(args); System.out.println(ctx.getBean(FooService.class).foo("foo")); ctx.close(); diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java index 7a50dc65..d484b3ac 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2017 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. @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.si4demo.springone.f; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -49,7 +51,7 @@ public class FMail { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = new SpringApplicationBuilder(FMail.class) - .web(false) + .web(WebApplicationType.NONE) .run(args); System.out.println(ctx.getBean(FooService.class).foo("foo")); ctx.close(); diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java index 60124949..ed399fd2 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2017 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. @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.si4demo.springone.g; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -45,7 +47,7 @@ public class GIMAP { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = new SpringApplicationBuilder(GIMAP.class) - .web(false) + .web(WebApplicationType.NONE) .run(args); System.out.println("Hit Enter to terminate"); System.in.read(); diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d3b83982..472cb4f4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e19b3863..1c4e4567 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 01 14:33:17 EDT 2016 +#Wed Apr 05 16:07:30 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip diff --git a/gradlew b/gradlew index 27309d92..4453ccea 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f6d5974e..e95643d6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -49,7 +49,6 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b7826cdd..4bb890d7 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index b8d7b9a0..9daeaac4 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 30d042c4..c5a75aab 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 9996f4bb..8906ef21 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-file - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index c2687e27..f49b8aea 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-mail - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-file - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -94,6 +94,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -106,6 +112,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework @@ -116,7 +128,7 @@ org.springframework.integration spring-integration-test - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 test diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java index 1784e2b2..0f826d28 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2017 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.mailattachments.support; import java.io.File; @@ -20,7 +21,7 @@ import java.io.File; import org.springframework.util.Assert; /** - * Represents a part of the original email messsage. EmailFragments could be either + * Represents a part of the original email message. EmailFragments could be either * Email messages themselves or also attachments. The sample will use {@link EmailFragment}s * to ultimately write the various pieces that constitute an email message out to * the file system. @@ -32,8 +33,10 @@ import org.springframework.util.Assert; public class EmailFragment { private Object data; + private String filename; - private File directory; + + private File directory; /** * Constructor. @@ -45,9 +48,9 @@ public class EmailFragment { public EmailFragment(File directory, String filename, Object data) { super(); - Assert.notNull(directory); - Assert.hasText(filename); - Assert.notNull(data); + Assert.notNull(directory, "'directory' must not be null"); + Assert.hasText(filename, "'filename' must not be empty"); + Assert.notNull(data, "'data' must not be null"); this.directory = directory; this.filename = filename; diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 6258f677..348edb4b 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -55,19 +55,19 @@ org.springframework.integration spring-integration-jmx - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-twitter - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-groovy - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -93,6 +93,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -105,6 +111,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index dfbbd3eb..596f9e18 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -55,7 +55,7 @@ org.springframework.integration spring-integration-http - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -93,6 +93,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -105,6 +111,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index fd477a2c..07329bb1 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -55,7 +55,7 @@ org.springframework.integration spring-integration-http - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -103,13 +103,13 @@ org.springframework.security spring-security-web - 4.2.0.RELEASE + 4.2.2.RELEASE compile org.springframework.security spring-security-config - 4.2.0.RELEASE + 4.2.2.RELEASE compile @@ -129,6 +129,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -141,6 +147,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 883dcbde..f760990e 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-stream - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-amqp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-ftp - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-file - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -82,6 +82,12 @@ mockito-core 1.10.19 compile + + + * + org.hamcrest + + org.hamcrest @@ -100,6 +106,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 3b3ed635..488c512f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index ee60d5e3..59d942af 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -76,6 +76,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -88,6 +94,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 294e7717..e94ea139 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -82,6 +82,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -94,6 +100,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 710377ec..7443e1e2 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index febb2699..4d76a3e4 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -88,6 +88,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -100,6 +106,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 62b73011..624be77d 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -70,6 +70,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -82,6 +88,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework @@ -92,7 +104,7 @@ org.springframework.integration spring-integration-test - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 test diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 663c5a14..a51af75d 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-ws - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -82,6 +82,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -94,6 +100,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 06b205fa..f577d94c 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile org.springframework.integration spring-integration-file - 5.0.0.BUILD-SNAPSHOT + 5.0.0.M3 compile @@ -82,6 +82,12 @@ junit 4.12 test + + + * + org.hamcrest + + org.hamcrest @@ -94,6 +100,12 @@ mockito-core 1.10.19 test + + + * + org.hamcrest + + org.springframework