Fix deprecation warnings

* Use `MatcherAssert.assertThat()`
instead of deprecated `Assert.assertThat()`
* Use `IntegrationFlows.fromSupplier(Supplier)`
instead of removed `IntegrationFlows.from(Supplier)`
* Use `org.springframework.integration:spring-integration-test`
throughout the project for more testing utilities
This commit is contained in:
Artem Bilan
2020-06-29 11:00:32 -04:00
parent cb9f6eb0a5
commit 21e44479ee
87 changed files with 438 additions and 564 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>advanced-testing-examples</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Advanced Testing Examples</name>
<description>Advanced Testing Examples</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -146,8 +146,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -181,14 +181,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-ftp</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Dynamic FTP Demo</name>
<description>Dynamic FTP Demo</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -123,8 +123,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,14 +158,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -15,9 +15,9 @@
*/
package org.springframework.integration.samples.ftp;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.io.File;

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-tcp-client</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Dynamic TCP Client</name>
<description>Dynamic TCP Client</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -127,8 +127,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -174,7 +174,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -188,14 +188,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>advanced</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<url>https://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>