From c396c5c756d1c01e1b6b0717ff64ae72ab78cb36 Mon Sep 17 00:00:00 2001
From: Marius Bogoevici <mbogoevici@pivotal.io>
Date: Fri, 23 Jun 2017 16:57:22 -0400
Subject: [PATCH] Release 2.0.0.M1

---
 pom.xml                                              | 12 ++++++------
 spring-cloud-starter-stream-kafka/pom.xml            |  2 +-
 spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml |  4 ++++
 spring-cloud-stream-binder-kafka-core/pom.xml        |  2 +-
 spring-cloud-stream-binder-kafka-docs/pom.xml        |  2 +-
 spring-cloud-stream-binder-kafka/pom.xml             | 11 +++++++++++
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a2e1b9d1..1c7076af4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,20 +2,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.M1</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M1</version>
 		<relativePath />
 	</parent>
 	<properties>
 		<java.version>1.7</java.version>
 		<kafka.version>0.10.2.0</kafka.version>
-		<spring-kafka.version>2.0.0.BUILD-SNAPSHOT</spring-kafka.version>
-		<spring-integration-kafka.version>3.0.0.BUILD-SNAPSHOT</spring-integration-kafka.version>
-		<spring-cloud-stream.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-stream.version>
+		<spring-kafka.version>2.0.0.M2</spring-kafka.version>
+		<spring-integration-kafka.version>3.0.0.M1</spring-integration-kafka.version>
+		<spring-cloud-stream.version>2.0.0.M1</spring-cloud-stream.version>
 	</properties>
 	<modules>
 		<module>spring-cloud-stream-binder-kafka</module>
@@ -152,7 +152,7 @@
 					<dependency>
 						<groupId>org.springframework.cloud</groupId>
 						<artifactId>spring-cloud-build-tools</artifactId>
-						<version>2.0.0.BUILD-SNAPSHOT</version>
+						<version>2.0.0.M1</version>
 					</dependency>
 				</dependencies>
 				<executions>
diff --git a/spring-cloud-starter-stream-kafka/pom.xml b/spring-cloud-starter-stream-kafka/pom.xml
index 9a5909595..9517c26d0 100644
--- a/spring-cloud-starter-stream-kafka/pom.xml
+++ b/spring-cloud-starter-stream-kafka/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M1</version>
 	</parent>
 	<artifactId>spring-cloud-starter-stream-kafka</artifactId>
 	<description>Spring Cloud Starter Stream Kafka</description>
diff --git a/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml b/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml
index cab1d9525..8031acf70 100644
--- a/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml
+++ b/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml
@@ -4,7 +4,11 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
+<<<<<<< b20f4a0e08629664c73e2e6cc1e73ac791509697
         <version>1.3.1.BUILD-SNAPSHOT</version>
+=======
+        <version>2.0.0.M1</version>
+>>>>>>> Release 2.0.0.M1
     </parent>
     <artifactId>spring-cloud-stream-binder-kafka-0.10.1-test</artifactId>
     <description>Spring Cloud Stream Kafka Binder 0.10.1 Tests</description>
diff --git a/spring-cloud-stream-binder-kafka-core/pom.xml b/spring-cloud-stream-binder-kafka-core/pom.xml
index 6890ca948..b6ce4a7c1 100644
--- a/spring-cloud-stream-binder-kafka-core/pom.xml
+++ b/spring-cloud-stream-binder-kafka-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <version>2.0.0.M1</version>
     </parent>
     <artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
     <description>Spring Cloud Stream Kafka Binder Core</description>
diff --git a/spring-cloud-stream-binder-kafka-docs/pom.xml b/spring-cloud-stream-binder-kafka-docs/pom.xml
index 666702d56..9eabdda92 100644
--- a/spring-cloud-stream-binder-kafka-docs/pom.xml
+++ b/spring-cloud-stream-binder-kafka-docs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <version>2.0.0.M1</version>
     </parent>
 
     <artifactId>spring-cloud-stream-binder-kafka-docs</artifactId>
diff --git a/spring-cloud-stream-binder-kafka/pom.xml b/spring-cloud-stream-binder-kafka/pom.xml
index 028d52614..51e3a55ed 100644
--- a/spring-cloud-stream-binder-kafka/pom.xml
+++ b/spring-cloud-stream-binder-kafka/pom.xml
@@ -10,21 +10,29 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
+<<<<<<< b20f4a0e08629664c73e2e6cc1e73ac791509697
 <<<<<<< e3460d6fcef9406fc9c6018f0f828630b929a815
 		<version>1.3.1.BUILD-SNAPSHOT</version>
 =======
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 >>>>>>> Update version to 2.0.0.BUILD-SNAPSHOT
+=======
+		<version>2.0.0.M1</version>
+>>>>>>> Release 2.0.0.M1
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
+<<<<<<< b20f4a0e08629664c73e2e6cc1e73ac791509697
 <<<<<<< e3460d6fcef9406fc9c6018f0f828630b929a815
 =======
 			<version>2.0.0.BUILD-SNAPSHOT</version>
 >>>>>>> Update version to 2.0.0.BUILD-SNAPSHOT
+=======
+			<version>2.0.0.M1</version>
+>>>>>>> Release 2.0.0.M1
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -82,6 +90,7 @@
 			<artifactId>spring-cloud-stream-binder-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+<<<<<<< b20f4a0e08629664c73e2e6cc1e73ac791509697
 <<<<<<< e3460d6fcef9406fc9c6018f0f828630b929a815
 =======
 		<dependency>
@@ -103,6 +112,8 @@
 			<scope>test</scope>
 		</dependency>
 >>>>>>> Update version to 2.0.0.BUILD-SNAPSHOT
+=======
+>>>>>>> Release 2.0.0.M1
 	</dependencies>
 
 	<build>