Upgrade to Mockito-2.10.0 and appropriate fixes

This commit is contained in:
Artem Bilan
2017-09-21 15:46:21 -04:00
parent e8fc589c5d
commit 6ce495e427
66 changed files with 213 additions and 216 deletions

View File

@@ -139,7 +139,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -192,14 +192,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>