From a58169f4e190a69e9d3ea122ff088c08d6fcfd96 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 18 Mar 2020 14:27:25 -0400 Subject: [PATCH] Fix Gradle Deprecations * Rename schema * Upgrade to Gradle 6.3-rc-3 for transitive dependency fix. * Remove version from schema; polish `build.gradle` to remove unneeded features. --- .../src/main/resources/META-INF/spring.schemas | 9 ++++----- ...ration-kafka-3.2.xsd => spring-integration-kafka.xsd} | 0 2 files changed, 4 insertions(+), 5 deletions(-) rename spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/{spring-integration-kafka-3.2.xsd => spring-integration-kafka.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 44b8d8973f..434ebb455a 100644 --- a/spring-integration-kafka/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-kafka/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,4 @@ -http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka-3.2.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-3.2.xsd -http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-3.2.xsd -https\://www.springframework.org/schema/integration/kafka/spring-integration-kafka-3.2.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-3.2.xsd -https\://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd=org/springframework/integration/kafka/config/spring-integration-kafka-3.2.xsd - +http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka-3.3.xsd=org/springframework/integration/kafka/config/spring-integration-kafka.xsd +http\://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd=org/springframework/integration/kafka/config/spring-integration-kafka.xsd +https\://www.springframework.org/schema/integration/kafka/spring-integration-kafka-3.3.xsd=org/springframework/integration/kafka/config/spring-integration-kafka.xsd +https\://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd=org/springframework/integration/kafka/config/spring-integration-kafka.xsd diff --git a/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-3.2.xsd b/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka.xsd similarity index 100% rename from spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-3.2.xsd rename to spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka.xsd