Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to SI-5.0 M3

Browse Source 
* Fix Spring Boot 2.0 B-S compatibility
* Fix deprecation warnings
* regenerate POMs according new dependency versions
This commit is contained in:
Artem Bilan
2017-04-05 17:09:49 -04:00
parent ea919aa4be
commit 2b80cf25a8
74 changed files with 1075 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
advanced/advanced-testing-examples/pom.xml
View File

@@ -62,13 +62,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jms</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -82,6 +82,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -94,6 +100,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
advanced/dynamic-ftp/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
advanced/dynamic-tcp-client/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -73,6 +73,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -85,6 +91,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

20
applications/cafe-scripted/pom.xml
View File

@@ -56,25 +56,25 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-rmi</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jmx</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -106,6 +106,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -118,6 +124,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
applications/cafe/cafe-amqp/pom.xml
View File

@@ -62,7 +62,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

20
applications/cafe/cafe-jms/pom.xml
View File

@@ -70,11 +70,17 @@
<artifactId>activemq-kahadb-store</artifactId>
<version>5.13.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jms</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -94,6 +100,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -106,6 +118,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
applications/cafe/cafe-si/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

22
applications/file-split-ftp/pom.xml
View File

@@ -70,25 +70,25 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mail</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -108,6 +108,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -120,6 +126,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -135,7 +147,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>test</scope>
</dependency>
</dependencies>

14
applications/loan-broker/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
applications/loanshark/pom.xml
View File

@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -219,6 +219,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -231,6 +237,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
applications/stomp-chat/pom.xml
View File

@@ -82,6 +82,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -94,6 +100,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
basic/amqp-affinity/pom.xml
View File

@@ -56,6 +56,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -68,6 +74,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/amqp/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

18
basic/barrier/pom.xml
View File

@@ -75,19 +75,19 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -95,6 +95,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -107,6 +113,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/control-bus/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/enricher/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/feed/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-feed</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/file/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

18
basic/ftp/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
<version>1.0.6</version>
<version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -88,6 +88,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -100,6 +106,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -116,7 +128,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>test</scope>
</dependency>
</dependencies>

14
basic/helloworld/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
basic/http-boot/pom.xml
View File

@@ -56,6 +56,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -68,6 +74,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/http/pom.xml
View File

@@ -55,13 +55,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mail</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -105,6 +105,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -117,6 +123,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/jdbc/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

24
basic/jms/pom.xml
View File

@@ -62,13 +62,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jms</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -82,6 +82,12 @@
<artifactId>activemq-kahadb-store</artifactId>
<version>5.13.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -94,6 +100,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -106,6 +118,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -116,7 +134,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>test</scope>
</dependency>
</dependencies>

16
basic/jmx/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jmx</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

158
basic/jpa/pom.xml
View File

@@ -62,62 +62,30 @@
<artifactId>spring-boot-starter-data-jpa</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<groupId>org.jboss.spec.javax.interceptor</groupId>
</exclusion>
<exclusion>
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
<exclusion>
<artifactId>cdi-api</artifactId>
<groupId>javax.enterprise</groupId>
</exclusion>
<exclusion>
<artifactId>el-api</artifactId>
<groupId>javax.el</groupId>
</exclusion>
<exclusion>
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
<groupId>org.jboss.spec.javax.transaction</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jpa</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<groupId>org.jboss.spec.javax.interceptor</groupId>
</exclusion>
<exclusion>
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
<exclusion>
<artifactId>cdi-api</artifactId>
<groupId>javax.enterprise</groupId>
</exclusion>
<exclusion>
<artifactId>el-api</artifactId>
<groupId>javax.el</groupId>
</exclusion>
<exclusion>
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
<groupId>org.jboss.spec.javax.transaction</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -126,30 +94,14 @@
<version>1.3.175</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<groupId>org.jboss.spec.javax.interceptor</groupId>
</exclusion>
<exclusion>
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
<exclusion>
<artifactId>cdi-api</artifactId>
<groupId>javax.enterprise</groupId>
</exclusion>
<exclusion>
<artifactId>el-api</artifactId>
<groupId>javax.el</groupId>
</exclusion>
<exclusion>
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
<groupId>org.jboss.spec.javax.transaction</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -158,30 +110,14 @@
<version>5.0.0.BUILD-SNAPSHOT</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<groupId>org.jboss.spec.javax.interceptor</groupId>
</exclusion>
<exclusion>
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
<exclusion>
<artifactId>cdi-api</artifactId>
<groupId>javax.enterprise</groupId>
</exclusion>
<exclusion>
<artifactId>el-api</artifactId>
<groupId>javax.el</groupId>
</exclusion>
<exclusion>
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
<groupId>org.jboss.spec.javax.transaction</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -190,30 +126,14 @@
<version>1.0.0.Final</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<groupId>org.jboss.spec.javax.interceptor</groupId>
</exclusion>
<exclusion>
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
<exclusion>
<artifactId>cdi-api</artifactId>
<groupId>javax.enterprise</groupId>
</exclusion>
<exclusion>
<artifactId>el-api</artifactId>
<groupId>javax.el</groupId>
</exclusion>
<exclusion>
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
<groupId>org.jboss.spec.javax.transaction</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -222,30 +142,14 @@
<version>2.4.2</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<groupId>org.jboss.spec.javax.interceptor</groupId>
</exclusion>
<exclusion>
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
<exclusion>
<artifactId>cdi-api</artifactId>
<groupId>javax.enterprise</groupId>
</exclusion>
<exclusion>
<artifactId>el-api</artifactId>
<groupId>javax.el</groupId>
</exclusion>
<exclusion>
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
<groupId>org.jboss.spec.javax.transaction</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -253,6 +157,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -265,6 +175,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

20
basic/kafka/pom.xml
View File

@@ -67,11 +67,17 @@
<artifactId>spring-integration-kafka</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -91,6 +97,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -103,6 +115,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/mail/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mail</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -88,6 +88,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -100,6 +106,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/mongodb/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mongodb</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/mqtt/pom.xml
View File

@@ -65,13 +65,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -79,6 +79,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -91,6 +97,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/oddeven/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/quote/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/sftp/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-sftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.14.0</version>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/splunk/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -79,6 +79,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -91,6 +97,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/tcp-amqp/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -88,6 +88,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -100,6 +106,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/tcp-client-server/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -82,6 +82,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -94,6 +100,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

20
basic/testing-examples/pom.xml
View File

@@ -56,19 +56,19 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ws</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -88,6 +88,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -100,6 +106,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -110,7 +122,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>test</scope>
</dependency>
</dependencies>

14
basic/twitter/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-twitter</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
basic/web-sockets/pom.xml
View File

@@ -72,6 +72,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -84,6 +90,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/ws-inbound-gateway/pom.xml
View File

@@ -55,13 +55,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-xml</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ws</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -81,6 +81,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -93,6 +99,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
basic/ws-outbound-gateway/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ws</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/xml/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-xml</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
basic/xmpp/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-xmpp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

249
build.gradle
View File

@@ -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) {

14
dsl/cafe-dsl/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -85,6 +85,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -97,6 +103,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
dsl/kafka-dsl/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -85,6 +85,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -97,6 +103,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
dsl/pom.xml
View File

@@ -56,6 +56,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -68,6 +74,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
dsl/si4demo/pom.xml
View File

@@ -110,6 +110,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -122,6 +128,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java
View File

@@ -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();

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java
View File

@@ -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();

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java
View File

@@ -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();

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java
View File

@@ -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();

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

22
gradlew vendored
View File

@@ -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" "$@"

6
gradlew.bat vendored
View File

@@ -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

14
intermediate/async-gateway/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/dynamic-poller/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/errorhandling/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/file-processing/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

18
intermediate/mail-attachments/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mail</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -94,6 +94,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -106,6 +112,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -116,7 +128,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>test</scope>
</dependency>
<dependency>

15
intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java
View File

@@ -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;

18
intermediate/monitoring/pom.xml
View File

@@ -55,19 +55,19 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jmx</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-twitter</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -93,6 +93,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -105,6 +111,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/multipart-http/pom.xml
View File

@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -93,6 +93,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -105,6 +111,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

18
intermediate/rest-http/pom.xml
View File

@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -103,13 +103,13 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>4.2.0.RELEASE</version>
<version>4.2.2.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>4.2.0.RELEASE</version>
<version>4.2.2.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -129,6 +129,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -141,6 +147,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

20
intermediate/retry-and-more/pom.xml
View File

@@ -56,25 +56,25 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -82,6 +82,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -100,6 +106,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/splitter-aggregator-reaper/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/stored-procedures-derby/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,6 +76,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -88,6 +94,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/stored-procedures-ms/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -82,6 +82,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -94,6 +100,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/stored-procedures-oracle/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -88,6 +88,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -100,6 +106,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
intermediate/tcp-client-server-multiplex/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -70,6 +70,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -82,6 +88,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -92,7 +104,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>test</scope>
</dependency>
</dependencies>

16
intermediate/travel/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ws</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -82,6 +82,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -94,6 +100,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

16
intermediate/tx-synch/pom.xml
View File

@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -82,6 +82,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -94,6 +100,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>