From 87561e565f86de2a9972f093b6f9a5e5dc984315 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 16 Nov 2016 11:57:13 -0500 Subject: [PATCH] Move XSD to 3.0 version * Upgrade to Gradle 3.2 * Increase timeout in the `KafkaTests` --- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-kafka-2.1.xsd => spring-integration-kafka-3.0.xsd} | 0 .../org/springframework/integration/kafka/dsl/KafkaTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/{spring-integration-kafka-2.1.xsd => spring-integration-kafka-3.0.xsd} (100%) diff --git a/spring-integration-kafka/src/main/resources/META-INF/spring.schemas b/spring-integration-kafka/src/main/resources/META-INF/spring.schemas index 0806da78d5..4f05d6cf4b 100644 --- a/spring-integration-kafka/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-kafka/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka-2.1.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-2.1.xsd -http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-2.1.xsd +http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka-3.0.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-3.0.xsd +http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-3.0.xsd diff --git a/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-2.1.xsd b/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-3.0.xsd similarity index 100% rename from spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-2.1.xsd rename to spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-3.0.xsd diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaTests.java index ece137980d..624b6085ec 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaTests.java @@ -108,7 +108,7 @@ public class KafkaTests { this.sendToKafkaFlowInput.send(new GenericMessage<>("foo")); for (int i = 0; i < 100; i++) { - Message receive = this.listeningFromKafkaResults.receive(10000); + Message receive = this.listeningFromKafkaResults.receive(20000); assertThat(receive).isNotNull(); assertThat(receive.getPayload()).isEqualTo("FOO"); MessageHeaders headers = receive.getHeaders();