From b6cbf15e4c9cdb8ef1d6440494927b7d6066f112 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Tue, 23 Aug 2016 12:38:44 -0400
Subject: [PATCH] Update to spring-kafka 1.1.0.M1

---
 .../integration/samples/kafka/Application.java           | 4 +++-
 build.gradle                                             | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java
index 48b33b55..a41ea0ce 100644
--- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java
+++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java
@@ -44,6 +44,7 @@ import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.core.ProducerFactory;
 import org.springframework.kafka.listener.KafkaMessageListenerContainer;
 import org.springframework.kafka.listener.config.ContainerProperties;
+import org.springframework.kafka.support.KafkaNull;
 import org.springframework.kafka.support.TopicPartitionInitialOffset;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
@@ -84,6 +85,7 @@ public class Application {
 		for (int i = 0; i < 10; i++) {
 			toKafka.send(new GenericMessage<>("foo" + i));
 		}
+		toKafka.send(new GenericMessage<>(KafkaNull.INSTANCE));
 		PollableChannel fromKafka = context.getBean("received", PollableChannel.class);
 		Message<?> received = fromKafka.receive(10000);
 		while (received != null) {
@@ -178,7 +180,7 @@ public class Application {
 			ZkUtils zkUtils = new ZkUtils(new ZkClient(this.zkConnect, 6000, 6000,
 				ZKStringSerializer$.MODULE$), null, false);
 			try {
-				AdminUtils.createTopic(zkUtils, topic, 1, 1, new Properties());
+				AdminUtils.createTopic(zkUtils, topic, 1, 1, new Properties(), null);
 			}
 			catch (TopicExistsException e) {
 				// no-op
diff --git a/build.gradle b/build.gradle
index ed91291d..8cd862f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -197,12 +197,12 @@ subprojects { subproject ->
 			postgresVersion = '9.1-901-1.jdbc4'
 			subethasmtpVersion = '1.2'
 			slf4jVersion = '1.7.11'
-			springIntegrationVersion = '4.3.0.RELEASE'
+			springIntegrationVersion = '4.3.1.RELEASE'
 			springIntegrationDslVersion = '1.1.2.RELEASE'
-			springIntegrationKafkaVersion = '2.0.0.RELEASE'
+			springIntegrationKafkaVersion = '2.0.1.RELEASE'
 			springIntegrationSplunkVersion = '1.1.0.RELEASE'
-			springKafkaVersion = '1.0.1.RELEASE'
-			springVersion = '4.3.0.RELEASE'
+			springKafkaVersion = '1.1.0.M1'
+			springVersion = '4.3.2.RELEASE'
 			springSecurityVersion = '4.0.2.RELEASE'
 			springWebFlowVersion = '2.3.3.RELEASE'
 			tilesJspVersion = '2.2.1'
@@ -609,6 +609,7 @@ project('kafka') {
 			exclude group: 'org.slf4j'
 		}
 		compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
+		compile "org.springframework.kafka:spring-kafka:$springKafkaVersion"
 		compile ("org.springframework.kafka:spring-kafka-test:$springKafkaVersion") {
 			exclude group: 'org.slf4j'
 		}