Merge branch '1.5.x'

2016-11-28 15:37:43 -08:00
parent 4870349438 ec73144240
commit b4c3f4f504
14 changed files with 39 additions and 34 deletions
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -627,7 +627,6 @@
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka-test</artifactId>
-			<version>${spring-kafka.version}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>