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

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>