From 2b80cf25a809d5d8fc381a266f805987edfd1a63 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 5 Apr 2017 17:09:49 -0400 Subject: [PATCH] Upgrade to SI-5.0 M3 * Fix Spring Boot 2.0 B-S compatibility * Fix deprecation warnings * regenerate POMs according new dependency versions --- advanced/advanced-testing-examples/pom.xml | 16 +- advanced/dynamic-ftp/pom.xml | 14 +- advanced/dynamic-tcp-client/pom.xml | 14 +- applications/cafe-scripted/pom.xml | 20 +- applications/cafe/cafe-amqp/pom.xml | 14 +- applications/cafe/cafe-jms/pom.xml | 20 +- applications/cafe/cafe-si/pom.xml | 14 +- applications/file-split-ftp/pom.xml | 22 +- applications/loan-broker/pom.xml | 14 +- applications/loanshark/pom.xml | 14 +- applications/stomp-chat/pom.xml | 12 + basic/amqp-affinity/pom.xml | 12 + basic/amqp/pom.xml | 16 +- basic/barrier/pom.xml | 18 +- basic/control-bus/pom.xml | 14 +- basic/enricher/pom.xml | 14 +- basic/feed/pom.xml | 14 +- basic/file/pom.xml | 14 +- basic/ftp/pom.xml | 18 +- basic/helloworld/pom.xml | 14 +- basic/http-boot/pom.xml | 12 + basic/http/pom.xml | 16 +- basic/jdbc/pom.xml | 14 +- basic/jms/pom.xml | 24 +- basic/jmx/pom.xml | 16 +- basic/jpa/pom.xml | 158 +++-------- basic/kafka/pom.xml | 20 +- basic/mail/pom.xml | 14 +- basic/mongodb/pom.xml | 14 +- basic/mqtt/pom.xml | 16 +- basic/oddeven/pom.xml | 14 +- basic/quote/pom.xml | 14 +- basic/sftp/pom.xml | 16 +- basic/splunk/pom.xml | 14 +- basic/tcp-amqp/pom.xml | 16 +- basic/tcp-client-server/pom.xml | 16 +- basic/testing-examples/pom.xml | 20 +- basic/twitter/pom.xml | 14 +- basic/web-sockets/pom.xml | 12 + basic/ws-inbound-gateway/pom.xml | 16 +- basic/ws-outbound-gateway/pom.xml | 16 +- basic/xml/pom.xml | 14 +- basic/xmpp/pom.xml | 14 +- build.gradle | 249 +++++++++--------- dsl/cafe-dsl/pom.xml | 14 +- dsl/kafka-dsl/pom.xml | 14 +- dsl/pom.xml | 12 + dsl/si4demo/pom.xml | 12 + .../samples/si4demo/springone/d/DBoot.java | 6 +- .../samples/si4demo/springone/e/EDSL.java | 6 +- .../samples/si4demo/springone/f/FMail.java | 6 +- .../samples/si4demo/springone/g/GIMAP.java | 6 +- gradle/wrapper/gradle-wrapper.jar | Bin 53319 -> 54212 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 22 +- gradlew.bat | 6 - intermediate/async-gateway/pom.xml | 14 +- intermediate/dynamic-poller/pom.xml | 14 +- intermediate/errorhandling/pom.xml | 14 +- intermediate/file-processing/pom.xml | 14 +- intermediate/mail-attachments/pom.xml | 18 +- .../support/EmailFragment.java | 15 +- intermediate/monitoring/pom.xml | 18 +- intermediate/multipart-http/pom.xml | 14 +- intermediate/rest-http/pom.xml | 18 +- intermediate/retry-and-more/pom.xml | 20 +- .../splitter-aggregator-reaper/pom.xml | 14 +- intermediate/stored-procedures-derby/pom.xml | 14 +- intermediate/stored-procedures-ms/pom.xml | 14 +- intermediate/stored-procedures-oracle/pom.xml | 14 +- .../stored-procedures-postgresql/pom.xml | 14 +- .../tcp-client-server-multiplex/pom.xml | 16 +- intermediate/travel/pom.xml | 16 +- intermediate/tx-synch/pom.xml | 16 +- 74 files changed, 1075 insertions(+), 367 deletions(-) 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 d3b83982b9b1bccad955349d702be9b884c6e049..472cb4f42044fb07e6e9a89dedead9f706532589 100644 GIT binary patch delta 21905 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 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