Release 2.0.0.M1

This commit is contained in:
Marius Bogoevici
2017-06-23 16:57:22 -04:00
committed by Soby Chacko
parent b20f4a0e08
commit c396c5c756
6 changed files with 24 additions and 9 deletions

12
pom.xml
View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>