Minor fixes
- Upgraded versions of reactor and SI in poms - added .jdk8 to enable java-8 in build - fixed changes in mockito api
This commit is contained in:
committed by
Soby Chacko
parent
57d3ba3317
commit
d317638bef
4
pom.xml
4
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>
|
||||
|
||||
0
spring-cloud-stream-binder-test/.jdk8
Normal file
0
spring-cloud-stream-binder-test/.jdk8
Normal file
0
spring-cloud-stream-core-docs/.jdk8
Normal file
0
spring-cloud-stream-core-docs/.jdk8
Normal file
0
spring-cloud-stream-integration-tests/.jdk8
Normal file
0
spring-cloud-stream-integration-tests/.jdk8
Normal file
0
spring-cloud-stream-metrics/.jdk8
Normal file
0
spring-cloud-stream-metrics/.jdk8
Normal file
0
spring-cloud-stream-rxjava/.jdk8
Normal file
0
spring-cloud-stream-rxjava/.jdk8
Normal file
0
spring-cloud-stream-schema-server/.jdk8
Normal file
0
spring-cloud-stream-schema-server/.jdk8
Normal file
0
spring-cloud-stream-schema/.jdk8
Normal file
0
spring-cloud-stream-schema/.jdk8
Normal file
0
spring-cloud-stream-test-support-internal/.jdk8
Normal file
0
spring-cloud-stream-test-support-internal/.jdk8
Normal file
0
spring-cloud-stream-test-support/.jdk8
Normal file
0
spring-cloud-stream-test-support/.jdk8
Normal file
0
spring-cloud-stream-tools/.jdk8
Normal file
0
spring-cloud-stream-tools/.jdk8
Normal file
0
spring-cloud-stream/.jdk8
Normal file
0
spring-cloud-stream/.jdk8
Normal file
@@ -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>
|
||||
|
||||
@@ -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(),
|
||||
|
||||
Reference in New Issue
Block a user