From ae582440e61676e40a4704b231ac62086c734e1d Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Fri, 23 Feb 2018 12:48:06 -0500
Subject: [PATCH] Updates to BOM

Remove rxjava, metrics kafka-test-support
Rename kstream binder to kafka-streams binder
docs pom cleanup
---
 spring-cloud-stream-dependencies/pom.xml | 17 +----------------
 spring-cloud-stream-docs/pom.xml         | 11 +++--------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/spring-cloud-stream-dependencies/pom.xml b/spring-cloud-stream-dependencies/pom.xml
index fa4231c..9971e7e 100644
--- a/spring-cloud-stream-dependencies/pom.xml
+++ b/spring-cloud-stream-dependencies/pom.xml
@@ -29,16 +29,6 @@
                 <artifactId>spring-cloud-stream-reactive</artifactId>
                 <version>${spring.cloud.stream.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-stream-metrics</artifactId>
-                <version>${spring.cloud.stream.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-stream-rxjava</artifactId>
-                <version>${spring.cloud.stream.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-stream-schema</artifactId>
@@ -66,7 +56,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-stream-binder-kstream</artifactId>
+                <artifactId>spring-cloud-stream-binder-kafka-streams</artifactId>
                 <version>${spring.cloud.stream.binder.kafka.version}</version>
             </dependency>
             <dependency>
@@ -79,11 +69,6 @@
                 <artifactId>spring-cloud-starter-stream-kafka</artifactId>
                 <version>${spring.cloud.stream.binder.kafka.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-stream-binder-kafka-test-support</artifactId>
-                <version>${spring.cloud.stream.binder.kafka.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
diff --git a/spring-cloud-stream-docs/pom.xml b/spring-cloud-stream-docs/pom.xml
index 628dc01..7223964 100644
--- a/spring-cloud-stream-docs/pom.xml
+++ b/spring-cloud-stream-docs/pom.xml
@@ -13,9 +13,9 @@
 	<version>Elmhurst.BUILD-SNAPSHOT</version>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
-		<spring.cloud.stream.version>2.0.0.BUILD-SNAPSHOT</spring.cloud.stream.version>
-		<spring.cloud.stream.binder.kafka.version>2.0.0.BUILD-SNAPSHOT</spring.cloud.stream.binder.kafka.version>
-		<spring.cloud.stream.binder.rabbit.version>2.0.0.BUILD-SNAPSHOT</spring.cloud.stream.binder.rabbit.version>
+		<spring.cloud.stream.version>2.0.0.RC1</spring.cloud.stream.version>
+		<spring.cloud.stream.binder.kafka.version>2.0.0.RC1</spring.cloud.stream.binder.kafka.version>
+		<spring.cloud.stream.binder.rabbit.version>2.0.0.RC1</spring.cloud.stream.binder.rabbit.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -23,11 +23,6 @@
 			<artifactId>spring-cloud-stream</artifactId>
 			<version>${spring.cloud.stream.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-rxjava</artifactId>
-			<version>${spring.cloud.stream.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka</artifactId>