diff --git a/pom.xml b/pom.xml index 1c7076af4..6a2e1b9d1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,20 +2,20 @@ 4.0.0 spring-cloud-stream-binder-kafka-parent - 2.0.0.M1 + 2.0.0.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.0.0.M1 + 2.0.0.BUILD-SNAPSHOT 1.7 0.10.2.0 - 2.0.0.M2 - 3.0.0.M1 - 2.0.0.M1 + 2.0.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-cloud-stream-binder-kafka @@ -152,7 +152,7 @@ org.springframework.cloud spring-cloud-build-tools - 2.0.0.M1 + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-stream-kafka/pom.xml b/spring-cloud-starter-stream-kafka/pom.xml index 9517c26d0..9a5909595 100644 --- a/spring-cloud-starter-stream-kafka/pom.xml +++ b/spring-cloud-starter-stream-kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 2.0.0.M1 + 2.0.0.BUILD-SNAPSHOT spring-cloud-starter-stream-kafka Spring Cloud Starter Stream Kafka 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 8031acf70..8c6f6b036 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,11 +4,15 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent +<<<<<<< c396c5c756d1c01e1b6b0717ff64ae72ab78cb36 <<<<<<< b20f4a0e08629664c73e2e6cc1e73ac791509697 1.3.1.BUILD-SNAPSHOT ======= 2.0.0.M1 >>>>>>> Release 2.0.0.M1 +======= + 2.0.0.BUILD-SNAPSHOT +>>>>>>> Set version to 2.0.0.BUILD-SNAPSHOT spring-cloud-stream-binder-kafka-0.10.1-test Spring Cloud Stream Kafka Binder 0.10.1 Tests diff --git a/spring-cloud-stream-binder-kafka-core/pom.xml b/spring-cloud-stream-binder-kafka-core/pom.xml index b6ce4a7c1..6890ca948 100644 --- a/spring-cloud-stream-binder-kafka-core/pom.xml +++ b/spring-cloud-stream-binder-kafka-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 2.0.0.M1 + 2.0.0.BUILD-SNAPSHOT spring-cloud-stream-binder-kafka-core Spring Cloud Stream Kafka Binder Core diff --git a/spring-cloud-stream-binder-kafka-docs/pom.xml b/spring-cloud-stream-binder-kafka-docs/pom.xml index 9eabdda92..666702d56 100644 --- a/spring-cloud-stream-binder-kafka-docs/pom.xml +++ b/spring-cloud-stream-binder-kafka-docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 2.0.0.M1 + 2.0.0.BUILD-SNAPSHOT spring-cloud-stream-binder-kafka-docs diff --git a/spring-cloud-stream-binder-kafka/pom.xml b/spring-cloud-stream-binder-kafka/pom.xml index 51e3a55ed..f995d4b9d 100644 --- a/spring-cloud-stream-binder-kafka/pom.xml +++ b/spring-cloud-stream-binder-kafka/pom.xml @@ -10,6 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent +<<<<<<< c396c5c756d1c01e1b6b0717ff64ae72ab78cb36 <<<<<<< b20f4a0e08629664c73e2e6cc1e73ac791509697 <<<<<<< e3460d6fcef9406fc9c6018f0f828630b929a815 1.3.1.BUILD-SNAPSHOT @@ -19,12 +20,16 @@ ======= 2.0.0.M1 >>>>>>> Release 2.0.0.M1 +======= + 2.0.0.BUILD-SNAPSHOT +>>>>>>> Set version to 2.0.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-stream-binder-kafka-core +<<<<<<< c396c5c756d1c01e1b6b0717ff64ae72ab78cb36 <<<<<<< b20f4a0e08629664c73e2e6cc1e73ac791509697 <<<<<<< e3460d6fcef9406fc9c6018f0f828630b929a815 ======= @@ -33,6 +38,9 @@ ======= 2.0.0.M1 >>>>>>> Release 2.0.0.M1 +======= + 2.0.0.BUILD-SNAPSHOT +>>>>>>> Set version to 2.0.0.BUILD-SNAPSHOT org.springframework.boot