SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing boot 2.0 tests lost on merge

Browse Source
This commit is contained in:
Vinicius Carvalho
2017-10-04 15:36:34 -04:00
committed by Soby Chacko
parent a9d7257c80
commit 41d51144ef
5 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pom.xml
View File

@@ -23,11 +23,7 @@
<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>
@@ -43,11 +39,6 @@
<artifactId>spring-cloud-stream-tools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-codec</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-rxjava</artifactId>