From d317638bef2017611c169bea917ba53b35dbb829 Mon Sep 17 00:00:00 2001
From: Vinicius Carvalho <viniciusccarvalho@gmail.com>
Date: Fri, 1 Sep 2017 16:40:03 -0400
Subject: [PATCH] Minor fixes - Upgraded versions of reactor and SI in poms -
 added .jdk8 to enable java-8 in build - fixed changes in mockito api

---
 .jdk8                                                     | 0
 pom.xml                                                   | 4 ++++
 spring-cloud-stream-binder-test/.jdk8                     | 0
 spring-cloud-stream-core-docs/.jdk8                       | 0
 spring-cloud-stream-integration-tests/.jdk8               | 0
 spring-cloud-stream-metrics/.jdk8                         | 0
 spring-cloud-stream-rxjava/.jdk8                          | 0
 spring-cloud-stream-schema-server/.jdk8                   | 0
 spring-cloud-stream-schema/.jdk8                          | 0
 spring-cloud-stream-test-support-internal/.jdk8           | 0
 spring-cloud-stream-test-support/.jdk8                    | 0
 spring-cloud-stream-tools/.jdk8                           | 0
 spring-cloud-stream/.jdk8                                 | 0
 spring-cloud-stream/pom.xml                               | 8 ++++++++
 .../stream/binder/AbstractMessageChannelBinderTests.java  | 4 ++--
 15 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 .jdk8
 create mode 100644 spring-cloud-stream-binder-test/.jdk8
 create mode 100644 spring-cloud-stream-core-docs/.jdk8
 create mode 100644 spring-cloud-stream-integration-tests/.jdk8
 create mode 100644 spring-cloud-stream-metrics/.jdk8
 create mode 100644 spring-cloud-stream-rxjava/.jdk8
 create mode 100644 spring-cloud-stream-schema-server/.jdk8
 create mode 100644 spring-cloud-stream-schema/.jdk8
 create mode 100644 spring-cloud-stream-test-support-internal/.jdk8
 create mode 100644 spring-cloud-stream-test-support/.jdk8
 create mode 100644 spring-cloud-stream-tools/.jdk8
 create mode 100644 spring-cloud-stream/.jdk8

diff --git a/.jdk8 b/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/pom.xml b/pom.xml
index bc2a5bbfe..9e74055a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,11 @@
         <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
         <spring.tuple.version>1.0.0.RELEASE</spring.tuple.version>
         <spring.integration.tuple.version>1.0.0.RELEASE</spring.integration.tuple.version>
+<<<<<<< 57d3ba33176c3f792c733850bf6e4f99ec6af24a
         <reactor.version>Bismuth-RELEASE</reactor.version>
+=======
+        <reactor.version>Bismuth-M3</reactor.version>
+>>>>>>> Minor fixes
         <kryo-shaded.version>3.0.3</kryo-shaded.version>
         <objenesis.version>2.1</objenesis.version>
     </properties>
diff --git a/spring-cloud-stream-binder-test/.jdk8 b/spring-cloud-stream-binder-test/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-core-docs/.jdk8 b/spring-cloud-stream-core-docs/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-integration-tests/.jdk8 b/spring-cloud-stream-integration-tests/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-metrics/.jdk8 b/spring-cloud-stream-metrics/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-rxjava/.jdk8 b/spring-cloud-stream-rxjava/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-schema-server/.jdk8 b/spring-cloud-stream-schema-server/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-schema/.jdk8 b/spring-cloud-stream-schema/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-test-support-internal/.jdk8 b/spring-cloud-stream-test-support-internal/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-test-support/.jdk8 b/spring-cloud-stream-test-support/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream-tools/.jdk8 b/spring-cloud-stream-tools/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream/.jdk8 b/spring-cloud-stream/.jdk8
new file mode 100644
index 000000000..e69de29bb
diff --git a/spring-cloud-stream/pom.xml b/spring-cloud-stream/pom.xml
index 3b5610886..e634af7e8 100644
--- a/spring-cloud-stream/pom.xml
+++ b/spring-cloud-stream/pom.xml
@@ -33,10 +33,18 @@
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
+<<<<<<< 57d3ba33176c3f792c733850bf6e4f99ec6af24a
+=======
+			<version>5.0.0.BUILD-SNAPSHOT</version>
+>>>>>>> Minor fixes
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-jmx</artifactId>
+<<<<<<< 57d3ba33176c3f792c733850bf6e4f99ec6af24a
+=======
+			<version>5.0.0.BUILD-SNAPSHOT</version>
+>>>>>>> Minor fixes
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinderTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinderTests.java
index 16f956fca..c5f493582 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinderTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinderTests.java
@@ -166,7 +166,7 @@ public class AbstractMessageChannelBinderTests {
 
 				@Override
 				public SimpleConsumerDestination answer(final InvocationOnMock invocation) throws Throwable {
-					return new SimpleConsumerDestination(invocation.getArgumentAt(0, String.class));
+					return new SimpleConsumerDestination(invocation.getArgument(0));
 				}
 
 			}).given(this.provisioningProvider).provisionConsumerDestination(anyString(), anyString(),
@@ -175,7 +175,7 @@ public class AbstractMessageChannelBinderTests {
 
 				@Override
 				public SimpleProducerDestination answer(final InvocationOnMock invocation) throws Throwable {
-					return new SimpleProducerDestination(invocation.getArgumentAt(0, String.class));
+					return new SimpleProducerDestination(invocation.getArgument(0));
 				}
 
 			}).given(this.provisioningProvider).provisionProducerDestination(anyString(),