Merge pull request #295 from garyrussell/INT-2355

INT-2355 Update Mockito to 1.9.0

build.gradle

@@ -122,7 +122,7 @@ configure(javaprojects) {
     javaxActivationVersion = '1.1.1'
     junitVersion = '4.8.2'
     log4jVersion = '1.2.12'
-    mockitoVersion = '1.8.4'
+    mockitoVersion = '1.9.0'
     springVersion = '3.0.7.RELEASE'
     springAmqpVersion = '1.0.0.RELEASE'
     springDataMongoVersion = '1.0.0.RELEASE'

spring-integration-amqp/pom.xml

@@ -190,7 +190,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-core/pom.xml

@@ -159,7 +159,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-event/pom.xml

@@ -133,7 +133,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-feed/pom.xml

@@ -157,7 +157,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-file/pom.xml

@@ -133,7 +133,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-ftp/pom.xml

@@ -158,7 +158,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-gemfire/pom.xml

@@ -175,7 +175,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-groovy/pom.xml

@@ -133,7 +133,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-http/pom.xml

@@ -177,7 +177,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-ip/pom.xml

@@ -139,7 +139,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-jdbc/pom.xml

@@ -185,7 +185,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-jms/pom.xml

@@ -169,7 +169,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-jmx/pom.xml

@@ -151,7 +151,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-mail/pom.xml

@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-mongodb/pom.xml

@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-redis/pom.xml

@@ -181,7 +181,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-rmi/pom.xml

@@ -139,7 +139,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-scripting/pom.xml

@@ -157,7 +157,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-security/pom.xml

@@ -157,7 +157,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-sftp/pom.xml

@@ -164,7 +164,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-stream/pom.xml

@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-test/pom.xml

@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

spring-integration-twitter/pom.xml

@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-ws/pom.xml

@@ -216,7 +216,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-xml/pom.xml

@@ -180,7 +180,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

spring-integration-xmpp/pom.xml

@@ -170,7 +170,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>