Remove Spring XD tuple dependency

- Use spring-cloud-stream-tuple instead

This resolves #280

spring-cloud-stream-binders/pom.xml

@@ -17,7 +17,6 @@
 	<properties>
 		<kafka.version>0.8.2.1</kafka.version>
 		<curator.version>2.6.0</curator.version>
-		<spring-xd.version>1.2.1.RELEASE</spring-xd.version>
 	</properties>
 	<modules>
 		<module>spring-cloud-stream-binder-test</module>
@@ -28,11 +27,6 @@
 	
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.xd</groupId>
-				<artifactId>spring-xd-tuple</artifactId>
-				<version>${spring-xd.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.kafka</groupId>
 				<artifactId>kafka_2.10</artifactId>

spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/pom.xml

@@ -76,12 +76,6 @@
 			<artifactId>rxjava-math</artifactId>
 			<version>${rxjava-math.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.xd</groupId>
-			<artifactId>spring-xd-tuple</artifactId>
-			<version>${spring-xd.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-recipes</artifactId>

spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTestBinder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,18 @@ package org.springframework.cloud.stream.binder.kafka;
 
 import java.util.List;
 
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Registration;
-
 import org.springframework.cloud.stream.binder.AbstractTestBinder;
 import org.springframework.cloud.stream.test.junit.kafka.KafkaTestSupport;
 import org.springframework.cloud.stream.test.junit.kafka.TestKafkaCluster;
+import org.springframework.cloud.stream.tuple.integration.TupleKryoRegistrar;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.integration.codec.Codec;
 import org.springframework.integration.codec.kryo.KryoRegistrar;
 import org.springframework.integration.codec.kryo.PojoCodec;
 import org.springframework.integration.kafka.support.ZookeeperConnect;
-import org.springframework.xd.tuple.serializer.kryo.TupleKryoRegistrar;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Registration;
 
 
 /**

spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml

@@ -64,10 +64,5 @@
 			<artifactId>joda-time</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.xd</groupId>
-			<artifactId>spring-xd-tuple</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>

spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/AbstractRedisSerializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,9 +31,9 @@ import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
 
+import org.springframework.cloud.stream.tuple.Tuple;
+import org.springframework.cloud.stream.tuple.TupleBuilder;
 import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.xd.tuple.Tuple;
-import org.springframework.xd.tuple.TupleBuilder;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml

@@ -34,11 +34,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.xd</groupId>
-			<artifactId>spring-xd-tuple</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream</artifactId>

spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,14 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Registration;
 import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.cloud.stream.binder.MessageChannelBinderSupport.JavaClassMimeTypeConversion;
+import org.springframework.cloud.stream.tuple.DefaultTuple;
+import org.springframework.cloud.stream.tuple.Tuple;
+import org.springframework.cloud.stream.tuple.TupleBuilder;
+import org.springframework.cloud.stream.tuple.integration.TupleKryoRegistrar;
 import org.springframework.integration.codec.kryo.KryoRegistrar;
 import org.springframework.integration.codec.kryo.PojoCodec;
 import org.springframework.integration.support.MessageBuilder;
@@ -41,10 +43,9 @@ import org.springframework.messaging.converter.ContentTypeResolver;
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
-import org.springframework.xd.tuple.DefaultTuple;
-import org.springframework.xd.tuple.Tuple;
-import org.springframework.xd.tuple.TupleBuilder;
-import org.springframework.xd.tuple.serializer.kryo.TupleKryoRegistrar;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Registration;
 
 /**
  * @author Gary Russell

spring-cloud-stream-starters/pom.xml

@@ -4,7 +4,6 @@
 	
 	<artifactId>spring-cloud-stream-starters</artifactId>
 	<packaging>pom</packaging>
-	<url>http://projects.spring.io/spring-xd/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
 		<url>http://www.spring.io</url>